@quorum/schematics - npm Package Compare versions

Comparing version 0.0.13 to 0.0.14

package.json

 {
   "name": "@quorum/schematics",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "A schematics Library for Quorum",
@@ -5,0 +5,0 @@ "scripts": {

server-route/dt-files/__routeParent__/__name@dasherize__/__name@dasherize__.controller.ts

 import { Server } from 'restify';
-import { EventEmitter } from 'events';
 import { <%= classify(nameSingular) %>s } from './<%= dasherize(nameSingular) %>s.class';
-import { MessageBrokerDataTerminal } from 'common/message-broker/message-broker-dataterminal';
-import { BrokerMessage } from 'common/message-broker/models/dataterminal/broker-message';
-import { BrokerMessageHeaders } from 'common/message-broker/models/dataterminal/broker-message-headers';
-import { BrokerMessagePayload } from 'common/message-broker/models/dataterminal/broker-message-payload';
+import { <%= classify(nameSingular) %>QueryParameters } from './<%= dasherize(nameSingular) %>.query-model';
+import { <%= classify(nameSingular) %> } from './<%= dasherize(nameSingular) %>.model';
+import {
+  DataTerminalBrokerMessage,
+  DataTerminalBrokerMessagePayload,
+  MessageBrokerDataTerminal
+} from 'common/message-broker';
+import { RestifyError } from 'common/errors/index';
 
 export default (server: Server, dtBroker: MessageBrokerDataTerminal) => {
   server.get('/v/:version/<%= dasherize(routeParent) %>/<%= dasherize(routeParent) %>s/:id', (req: any, res, next) => {
-    dtBroker.createQueue().then(queue => {
-      let emitter = new EventEmitter();
-      let brokerMessage = new BrokerMessage(
-        new BrokerMessageHeaders(
-          req.routingDetails.databaseServer,
-          req.routingDetails.databaseName,
-          'api.get<%= classify(nameSingular) %>'
-        )
-      );
-
-      brokerMessage.payloads.push(
+    try {
+      const brokerMessagePayloads = new Array<DataTerminalBrokerMessagePayload>();
+      brokerMessagePayloads.push(
         <%= classify(nameSingular) %>s.get<%= classify(nameSingular) %>(req.params.id, {
@@ -29,44 +24,47 @@ server: req.routingDetails.databaseServer,
 
-      brokerMessage.headers.returnQueue = queue;
-
-      emitter.addListener(brokerMessage.headers.returnEvent, data => {
-        let msg: BrokerMessage = JSON.parse(data);
-        dtBroker.deleteQueue(queue);
-        emitter.removeAllListeners();
-        res.json(msg.payloads[0].recordsets[0][0]);
-      });
-      dtBroker.consumeQueue(queue, emitter);
-      dtBroker.sendToQueue(req.routingDetails.terminalIdentifier, brokerMessage);
-    });
+      dtBroker
+        .sendMessage(req, brokerMessagePayloads, 'api.get<%= classify(nameSingular) %>')
+        .then((brokerMessage: DataTerminalBrokerMessage) => {
+          const <%= nameSingular %> : <%= classify(nameSingular) %> = brokerMessage.payloads[0].recordsets[0][0];
+          if (req.query.embed) {
+            //Fill out embed
+          } else {
+            res.json(<%= nameSingular %>);
+          }
+        })
+        .catch((err: any) => {
+          res.send(RestifyError.create(err, req));
+        });
+    } catch (err) {
+      res.send(RestifyError.create(err, req));
+    }
   });
 
   server.get('/v/:version/<%= dasherize(routeParent) %>/<%= dasherize(routeParent) %>s', (req: any, res, next) => {
-    dtBroker.createQueue().then(queue => {
-      let emitter = new EventEmitter();
-      let brokerMessage = new BrokerMessage(
-        new BrokerMessageHeaders(
-          req.routingDetails.databaseServer,
-          req.routingDetails.databaseName,
-          'api.get<%= classify(nameSingular) %>'
-        )
+    try {
+      const brokerMessagePayloads = new Array<DataTerminalBrokerMessagePayload>();
+      brokerMessagePayloads.push(
+        <%= classify(nameSingular) %>s.get<%= classify(nameSingular) %>s(req.query, {
+          server: req.routingDetails.databaseServer,
+          dsn: req.routingDetails.databaseName,
+          version: parseInt(req.params.version)
+        })
       );
-      brokerMessage.payloads.push( <%= classify(nameSingular) %>s.get<%= classify(nameSingular) %>s(req.query, {
-        server: req.routingDetails.databaseServer,
-        dsn: req.routingDetails.databaseName,
-        version: parseInt(req.params.version)
-      }));
 
-      brokerMessage.headers.returnQueue = queue;
-
-      emitter.addListener(brokerMessage.headers.returnEvent, data => {
-        let msg: BrokerMessage = JSON.parse(data);
-        dtBroker.deleteQueue(queue);
-        emitter.removeAllListeners();
-        //res.json([]);
-        res.json(msg.payloads[0].recordsets[0]);
-      });
-      dtBroker.consumeQueue(queue, emitter);
-
-      dtBroker.sendToQueue(req.routingDetails.terminalIdentifier, brokerMessage);
-    });
+      dtBroker
+        .sendMessage(req, brokerMessagePayloads, 'api.get<%= classify(nameSingular) %>s')
+        .then((brokerMessage: DataTerminalBrokerMessage) => {
+          const <%= nameSingular %>s : <%= classify(nameSingular) %>[] = brokerMessage.payloads[0].recordsets[0];
+          if (req.query.embed) {
+            //Fill out embed
+          } else {
+            res.json(<%= nameSingular %>s);
+          }
+        })
+        .catch((err: any) => {
+          res.send(RestifyError.create(err, req));
+        });
+    } catch (err) {
+      res.send(RestifyError.create(err, req));
+    }
   });
@@ -77,30 +75,26 @@
   server.post('/v/:version/<%= dasherize(routeParent) %>/<%= dasherize(routeParent) %>s', (req: any, res, next) => {
-    dtBroker.createQueue().then(queue => {
-      let emitter = new EventEmitter();
-      let brokerMessage = new BrokerMessage(
-        new BrokerMessageHeaders(
-          req.routingDetails.databaseServer,
-          req.routingDetails.databaseName,
-          'api.create<%= classify(nameSingular) %>'
-        )
+   
+    try {
+      const brokerMessagePayloads = new Array<DataTerminalBrokerMessagePayload>();
+      brokerMessagePayloads.push(
+        <%= classify(nameSingular) %>s.get<%= classify(nameSingular) %>s.create<%= classify(nameSingular) %>(req.body, {
+          server: req.routingDetails.databaseServer,
+          dsn: req.routingDetails.databaseName,
+          version: parseInt(req.params.version)
+        })
       );
-      brokerMessage.payloads.push( <%= classify(nameSingular) %>s.create<%= classify(nameSingular) %>(req.body, {
-        server: req.routingDetails.databaseServer,
-        dsn: req.routingDetails.databaseName,
-        version: parseInt(req.params.version)
-      }));
 
-      brokerMessage.headers.returnQueue = queue;
-
-      emitter.addListener(brokerMessage.headers.returnEvent, data => {
-        let msg: BrokerMessage = JSON.parse(data);
-        dtBroker.deleteQueue(queue);
-        emitter.removeAllListeners();
-        //res.json([]);
-        res.json(msg.payloads[0].recordsets[0]);
-      });
-      dtBroker.consumeQueue(queue, emitter);
-
-      dtBroker.sendToQueue(req.routingDetails.terminalIdentifier, brokerMessage);
-    });
+      dtBroker
+        .sendMessage(req, brokerMessagePayloads, 'api.create<%= classify(nameSingular) %>')
+        .then((brokerMessage: DataTerminalBrokerMessage) => {
+          const <%= nameSingular %> : <%= classify(nameSingular) %> = brokerMessage.payloads[0].recordsets[0][0];
+            res.json(<%= nameSingular %>);
+          
+        })
+        .catch((err: any) => {
+          res.send(RestifyError.create(err, req));
+        });
+    } catch (err) {
+      res.send(RestifyError.create(err, req));
+    }
   });
@@ -139,2 +133,26 @@
   });
+
+  try {
+    const brokerMessagePayloads = new Array<DataTerminalBrokerMessagePayload>();
+    brokerMessagePayloads.push(
+      <%= classify(nameSingular) %>s.update<%= classify(nameSingular) %>(req.body, {
+        server: req.routingDetails.databaseServer,
+        dsn: req.routingDetails.databaseName,
+        version: parseInt(req.params.version)
+      })
+    );
+
+    dtBroker
+      .sendMessage(req, brokerMessagePayloads, 'api.create<%= classify(nameSingular) %>')
+      .then((brokerMessage: DataTerminalBrokerMessage) => {
+        const <%= nameSingular %> : <%= classify(nameSingular) %> = brokerMessage.payloads[0].recordsets[0][0];
+          res.json(<%= nameSingular %>);
+        
+      })
+      .catch((err: any) => {
+        res.send(RestifyError.create(err, req));
+      });
+  } catch (err) {
+    res.send(RestifyError.create(err, req));
+  }
 };

No alert changes

Improved metrics

Total package byte prevSize

48309

1.12%

Lines of code

847

2.29%

No dependency changes