Merge pull request #5 from fabrix-app/v1.1

[feat] check against events

Author: scott-wyatt

.circleci/config.yml

@@ -31,9 +31,6 @@ jobs:
       - run:
           name: install-npm-wee
           command: npm install
-      - run:
-          name: install-npm-sqlite
-          command: npm install [email protected]
       - save_cache:
           key: dependency-cache-{{ checksum "package.json" }}
           paths:

lib/api/services/PermissionsService.ts

@@ -1,11 +1,15 @@
 import { FabrixService as Service } from '@fabrix/fabrix/dist/common'
 
 export class PermissionsService extends Service {
-  publish(type, event, options: {save?: boolean, transaction?: any} = {}) {
-    if (this.app.services.EngineService) {
-      return this.app.services.EngineService.publish(type, event, options)
+  publish(type, event, options: {save?: boolean, transaction?: any, include?: any} = {}) {
+    if (this.app.services.EventsService) {
+      options.include = options.include ||  [{
+        model: this.app.models.EventItem.instance,
+        as: 'objects'
+      }]
+      return this.app.services.EventsService.publish(type, event, options)
     }
-    this.app.log.debug('Spool-engine is not installed, please install it to use publish')
+    this.app.log.debug('spool-events is not installed, please install it to use publish')
     return Promise.resolve()
   }
 

lib/api/services/UserCsvService.ts

@@ -11,13 +11,15 @@ import { readFileSync } from 'fs'
  * @description User CSV Service
  */
 export class UserCsvService extends Service {
-  publish(type, event, options: {save?: boolean, transaction?: any} = {}) {
-    if (this.app.services.EngineService) {
-      return this.app.services.EngineService.publish(type, event, options)
-    }
-    else {
-      this.app.log.debug('Spool-engine is not installed, please install it to use publish')
+  publish(type, event, options: {save?: boolean, transaction?: any, include?: any} = {}) {
+    if (this.app.services.EventsService) {
+      options.include = options.include ||  [{
+        model: this.app.models.EventItem.instance,
+        as: 'objects'
+      }]
+      return this.app.services.EventsService.publish(type, event, options)
     }
+    this.app.log.debug('spool-events is not installed, please install it to use publish')
     return Promise.resolve()
   }
 

lib/config/permissions.ts

@@ -18,5 +18,9 @@ export const permissions = {
   // The default super admin username
   defaultAdminUsername: 'admin',
   // The default super admin password
-  defaultAdminPassword: 'admin1234'
+  defaultAdminPassword: 'admin1234',
+  // Send Emails
+  emails: {},
+  // Allow Events
+  events: {}
 }

lib/schemas/permissions.ts

@@ -12,5 +12,7 @@ export const permissions = joi.object().keys({
     permissions: joi.array()
   }).required(),
   defaultAdminUsername: joi.string().required(),
-  defaultAdminPassword: joi.string().required()
+  defaultAdminPassword: joi.string().required(),
+  emails: joi.object(),
+  events: joi.object()
 })