Tiers

.gitignore

@@ -6,4 +6,8 @@ node_modules/*
 npm-debug.log*
 /uploads/*
 env
-package-lock.json
+package-lock.json
+.flooignore
+.floo
+.o11n
+.sass-cache

Gruntfile.js

@@ -0,0 +1,28 @@
+module.exports = function(grunt) {
+
+    grunt.initConfig({
+        sass: {
+            dist:{
+                options: {
+                    style: 'expanded'
+                },
+                files: {
+                    'public/css/main.css' : 'public/scss/main.scss',
+                    'plugins/core-embeddables/css/style.css' : 'plugins/core-embeddables/scss/style.scss'
+                }
+            }
+        },
+        watch: {
+            css: {
+                files: ['public/scss/*.scss', 'plugins/**/scss/*.scss'],
+                tasks: ['sass']
+            }
+        }
+    });
+
+    grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-contrib-sass');
+
+    grunt.registerTask('default', ['watch']);
+
+};

Jenkinsfile

@@ -0,0 +1,57 @@
+def getRepo(){
+            String name = "${env.JOB_NAME}";
+            String[] value = name.split('/');
+            return value[0];
+}
+
+def gitCredentials = "JenkinsGithub"
+
+
+pipeline {
+    parameters {
+          booleanParam(defaultValue: true, description: 'Execute pipeline?', name: 'shouldBuild')
+       }
+
+  agent any
+  stages {
+        stage("Check if should build"){
+        steps{
+        script {
+            result = sh (script: "git log -1 | grep '.*Jenkins version bump.*'", returnStatus: true)
+            if (result == 0) {
+                echo ("'Version bump' spotted in git commit. Aborting.")
+                env.shouldBuild = "false"
+                throw "Bad"
+            }
+        }
+       }
+        }
+
+        stage('Build, bump version') {
+            when {
+                branch 'tiers'
+                expression {
+                    return env.shouldBuild != "false"
+                }
+
+            }
+          steps {
+
+              withCredentials([string(credentialsId: 'npm-token', variable: 'NPM_TOKEN')]) {
+                              sshagent(credentials: ["${gitCredentials}"]){
+
+                                sh '''
+                                      npm version patch -m "Jenkins version bump"
+                                      git push origin tiers
+                                      git push origin --tags
+                                '''
+
+
+                                }
+
+              }
+
+          }
+        }
+  }
+}

api-docs/api-definitions.json

@@ -55,6 +55,16 @@
       }
     }
   },
+  "metric_change": {
+    "type": "object",
+    "properties": {
+      "value": {
+        "type": "integer",
+        "format": "int32",
+        "description": "New number of metric"
+      }
+    }
+  },
   "service_instance_request": {
     "type": "object",
     "properties": {
@@ -71,6 +81,40 @@
         "type": "integer",
         "description": "Servicebot User ID, used for requesting a service instance for an existing User"
       },
+      "payment_structure_template_id": {
+        "type": "integer",
+        "description": "Payment Structure Template ID, used to select a specific payment structure to be attached to the created Service Instance"
+      },
+      "references": {
+        "type": "object",
+        "properties": {
+          "service_instance_properties": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/service_template_properties"
+            }
+          }
+        }
+      }
+    }
+  },
+  "service_instance_request_response": {
+    "type": "object",
+    "properties": {
+      "token": {
+        "type": "string",
+        "format": "string",
+        "description": "Servicebot auth token for the user requested."
+      },
+      "request": {
+        "type": "object",
+        "description": "Service Instance request details that were made",
+        "$ref": "#/definitions/service_instance_request"
+      },
+      "webhook_responses": {
+        "type": "string",
+        "description": "Response from webhook if one is configured. Will only be there is webhook was configure to be synchronous."
+      },
       "references": {
         "type": "object",
         "properties": {
@@ -83,5 +127,33 @@
         }
       }
     }
+  },
+  "seat": {
+    "type": "object",
+    "properties": {
+      "user_id": {
+        "type": "integer",
+        "description": "User Id"
+      },
+      "service_instance_id": {
+        "type": "integer",
+        "description": "Service Instance Id"
+      },
+      "id": {
+        "type": "integer",
+        "description": "Seat Id"
+      },
+      "references": {
+        "type": "object",
+        "properties": {
+          "users": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/users"
+            }
+          }
+        }
+      }
+    }
   }
 }