#37 filtrando escala por mes e por ano

Signed-off-by: Beatriz Hanae <beatriz.hanae@gmail.com> Signed-off-by: Ezequiel de Oliveira <ezequiel1de1oliveira@gmail.com> Co-Authored-by: Beatriz Hanae <beatriz.hanae@gmail.com> Co-Authored-by: Ezequiel de Oliveira <ezequiel1de1oliveira@gmail.com>
Dulce-Work-Schedule · May 4, 2018 · 10d5d9a · 10d5d9a
1 parent eb4a404
commit 10d5d9a
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 38 deletions.
diff --git a/Schedule/Client/api.js b/Schedule/Client/api.js
@@ -20,14 +20,35 @@ module.exports = function api(options) {
         },respond)
     });
 
+    this.add('role:api,path:listMonth',function(msg,respond){
+        var month = msg.args.query.month;
+        this.act('role:schedule,cmd:listMonth',{
+            month: month
+        },respond)
+    });
+
+    this.add('role:api,path:listSchedule', function(msg, respond){
+              this.act('role:schedule, cmd:listSchedule',{}, respond)
+
+            });
+    this.add('role:api,path:listYear',function(msg,respond){
+        var year = msg.args.query.year;
+        this.act('role:schedule,cmd:listYear',{
+            year:year
+        },respond)
+});
+
     this.add('init:api', function (msg, respond) {
         this.act('role:web', {
             routes: {
                 prefix: '/api/schedule',
                 pin: 'role:api,path:*',
                 map: {
                     create: { POST: true },
-                    listWeek: {GET : true}
+                    listWeek: {GET : true},
+                    listSchedule: {GET : true},
+                    listMonth: {GET : true},
+                    listYear: {GET : true}
                 }
             }
         },respond)

diff --git a/Schedule/Server/schedule.js b/Schedule/Server/schedule.js
@@ -1,47 +1,63 @@
 var seneca = require('seneca');
 
 seneca()
-.use('entity')
-.use('mongo-store',{
-    name: 'dataBaseSchedule',
-    host: 'mongo',
-    port: 27017
-})
-.use('seneca-amqp-transport')
-.listen({
-    type: 'amqp',
-    pin: 'role:schedule',
-    port: 5672,
-    username: 'guest',
-    password: 'guest',
-    url: 'amqp://rabbitmq'
-})
+    .use('entity')
+    .use('mongo-store', {
+        name: 'dataBaseSchedule',
+        host: 'mongo',
+        port: 27017
+    })
+    .use('seneca-amqp-transport')
+    .listen({
+        type: 'amqp',
+        pin: 'role:schedule',
+        port: 5672,
+        username: 'guest',
+        password: 'guest',
+        url: 'amqp://rabbitmq'
+    })
 
 
-.add('role:schedule,cmd:create', function(msg,respond){
-    var schedule = this.make('schedule');
-    schedule.month = msg.month;
-    schedule.year = msg.year;
-    schedule.week = msg.week;
-    schedule.day = msg.day;
-    schedule.save$(function(err,schedule){
-        respond(null,schedule)
+    .add('role:schedule,cmd:create', function (msg, respond) {
+        var schedule = this.make('schedule');
+        schedule.month = msg.month;
+        schedule.year = msg.year;
+        schedule.week = msg.week;
+        schedule.day = msg.day;
+        schedule.save$(function (err, schedule) {
+            respond(null, schedule)
+        })
     })
-})
-
-.add('role:schedule,cmd:listWeek',  function (msg,respond){
 
-    var week = msg.week;
-    var schedule = this.make('schedule');
-    schedule.list$({week}, function (error,schedule){
-        respond(null,schedule);
-      });
+    .add('role:schedule, cmd:listSchedule', function (msg, respond){
+
+        var schedule = this.make('schedule');
+        schedule.list$( { all$: true } , function(error, schedule){
+            respond(null, schedule);
+        });
     })
+
+    .add('role:schedule,cmd:listWeek', function (msg, respond) {
 
-  .add('role:schedule, cmd:listSchedule', function (msg, respond){
+        var week = msg.week;
+        var schedule = this.make('schedule');
+        schedule.list$({ week }, function (error, schedule) {
+            respond(null, schedule);
+        });
+    })
 
-    var schedule = this.make('schedule');
-    schedule.list$( { all$: true } , function(error, schedule){
-        respond(null, schedule);
-      });
-  })
+    .add('role:schedule,cmd:listMonth', function (msg, respond) {
+          var month = msg.month;
+          var schedule = this.make('schedule');
+          schedule.list$({ month }, function (error, schedule) {
+              respond(null, schedule);
+          });
+      })
+
+      .add('role:schedule,cmd:listYear',function(msg,respond){
+        var year = msg.year;
+        var schedule = this.make('schedule');
+        schedule.list$({year},function(error,schedule){
+            respond(null,schedule);
+        });
+    })