瀏覽代碼

Add declined and accepted events sorted

Matt Coles 9 年之前
父節點
當前提交
42f595bfbb
共有 4 個文件被更改,包括 86 次插入16 次删除
  1. 80 0
      README.md
  2. 0 14
      index.js
  3. 2 2
      presenters/event-controller.js
  4. 4 0
      utils/route-manager.js

+ 80 - 0
README.md

440
 The error codes are as follows, `1` indicates an invalid auth code and `2`
440
 The error codes are as follows, `1` indicates an invalid auth code and `2`
441
 indicates a malformed request.
441
 indicates a malformed request.
442
 
442
 
443
+### /events/accepted/
444
+To get a users accepted events, a `GET` request should be sent with the following
445
+data:
446
+```javascript
447
+{
448
+    "auth": "$2a$10$qjkvbcPZ4YC7/a/I0ZpTaeJp6auXjGrG9pgAdI3PP61u4CftQPSL2"
449
+}
450
+```
451
+The response will then look like this:
452
+```javascript
453
+{
454
+    "accepted_events": [
455
+        {
456
+            "name": "Super Mario Kart Party 5",
457
+            "location": "Marioland",
458
+            "society": "testsociety",
459
+            "start": "14605026110490",
460
+            "end": "14605026110500",
461
+            "details": "Play some Mario Kart with us",
462
+            "organiser": "test1",
463
+            "id": "851133039"
464
+        },
465
+        {
466
+            "name": "Super Mario Kart Party 6",
467
+            "location": "Marioland",
468
+            "society": "testsociety",
469
+            "start": "14605026110490",
470
+            "end": "14605026110500",
471
+            "details": "Play some Mario Kart with us",
472
+            "organiser": "test1",
473
+            "id": "838450388"
474
+        },
475
+        { ... }
476
+    ],
477
+    "error": 0
478
+}
479
+```
480
+The error codes are as follows, `1` indicates an invalid auth code and `2`
481
+indicates a malformed request.
482
+
483
+### /events/declined/
484
+To get a users declined events, a `GET` request should be sent with the following
485
+data:
486
+```javascript
487
+{
488
+    "auth": "$2a$10$qjkvbcPZ4YC7/a/I0ZpTaeJp6auXjGrG9pgAdI3PP61u4CftQPSL2"
489
+}
490
+```
491
+The response will then look like this:
492
+```javascript
493
+{
494
+    "declined_events": [
495
+        {
496
+            "name": "Super Mario Kart Party 5",
497
+            "location": "Marioland",
498
+            "society": "testsociety",
499
+            "start": "14605026110490",
500
+            "end": "14605026110500",
501
+            "details": "Play some Mario Kart with us",
502
+            "organiser": "test1",
503
+            "id": "851133039"
504
+        },
505
+        {
506
+            "name": "Super Mario Kart Party 6",
507
+            "location": "Marioland",
508
+            "society": "testsociety",
509
+            "start": "14605026110490",
510
+            "end": "14605026110500",
511
+            "details": "Play some Mario Kart with us",
512
+            "organiser": "test1",
513
+            "id": "838450388"
514
+        },
515
+        { ... }
516
+    ],
517
+    "error": 0
518
+}
519
+```
520
+The error codes are as follows, `1` indicates an invalid auth code and `2`
521
+indicates a malformed request.
522
+
443
 ### /events/accept/:eventid
523
 ### /events/accept/:eventid
444
 To accept an event, a `POST` request should be sent with the following data:
524
 To accept an event, a `POST` request should be sent with the following data:
445
 ```javascript
525
 ```javascript

+ 0 - 14
index.js

22
     console.log('Example app listening on port 3000!');
22
     console.log('Example app listening on port 3000!');
23
 });
23
 });
24
 
24
 
25
-https.createServer({
26
-   key: prkey,
27
-   cert: certi
28
-}, app).listen(3000, function() {
29
-  console.log("App listening for HTTPS connections on port 3000!");
30
-});
31
-
32
-https.createServer({
33
-   key: prkey,
34
-   cert: certi
35
-}, app).listen(443, function() {
36
-  console.log("App listening for HTTPS connections on port 3000!");
37
-});
38
-
39
 process.on('SIGINT', function() {
25
 process.on('SIGINT', function() {
40
   console.log( "\nRecieved Ctrl-C, shutting down." );
26
   console.log( "\nRecieved Ctrl-C, shutting down." );
41
   process.exit(0);
27
   process.exit(0);

+ 2 - 2
presenters/event-controller.js

253
     user_controller.get_user_from_auth(auth, function (username) {
253
     user_controller.get_user_from_auth(auth, function (username) {
254
       if (username) {
254
       if (username) {
255
         user_controller.get_public_user_info(username, function (data) {
255
         user_controller.get_public_user_info(username, function (data) {
256
-          var accepted_events = data.accepted_events;
256
+          var accepted_events = data.user.accepted_events;
257
           var accepted_events_objs = [];
257
           var accepted_events_objs = [];
258
           accepted_events.map(function (event_id) {
258
           accepted_events.map(function (event_id) {
259
             self.get_event(event_id, "", function (response) {
259
             self.get_event(event_id, "", function (response) {
282
     user_controller.get_user_from_auth(auth, function (username) {
282
     user_controller.get_user_from_auth(auth, function (username) {
283
       if (username) {
283
       if (username) {
284
         user_controller.get_public_user_info(username, function (data) {
284
         user_controller.get_public_user_info(username, function (data) {
285
-          var declined_events = data.declined_events;
285
+          var declined_events = data.user.declined_events;
286
           var declined_events_objs = [];
286
           var declined_events_objs = [];
287
           declined_events.map(function (event_id) {
287
           declined_events.map(function (event_id) {
288
             self.get_event(event_id, "", function (response) {
288
             self.get_event(event_id, "", function (response) {

+ 4 - 0
utils/route-manager.js

13
 var event_create = require("../routes/events/create-society-event.js");
13
 var event_create = require("../routes/events/create-society-event.js");
14
 var event_view = require("../routes/events/view-society-events.js");
14
 var event_view = require("../routes/events/view-society-events.js");
15
 var event_pending = require("../routes/events/view-pending-events.js");
15
 var event_pending = require("../routes/events/view-pending-events.js");
16
+var event_accepted = require("../routes/events/view-accepted-events.js");
17
+var event_declined = require("../routes/events/view-declined-events.js");
16
 var event_accept = require("../routes/events/accept-event.js");
18
 var event_accept = require("../routes/events/accept-event.js");
17
 var event_decline = require("../routes/events/decline-event.js");
19
 var event_decline = require("../routes/events/decline-event.js");
18
 var friend_add = require("../routes/friends/add-friend.js");
20
 var friend_add = require("../routes/friends/add-friend.js");
36
 router.all('/events/create/', event_create.perform);
38
 router.all('/events/create/', event_create.perform);
37
 router.all('/events/view/:eventid', event_view.perform);
39
 router.all('/events/view/:eventid', event_view.perform);
38
 router.all('/events/pending/', event_pending.perform);
40
 router.all('/events/pending/', event_pending.perform);
41
+router.all('/events/accepted/', event_accepted.perform);
42
+router.all('/events/declined/', event_declined.perform);
39
 router.all('/events/accept/:eventid', event_accept.perform);
43
 router.all('/events/accept/:eventid', event_accept.perform);
40
 router.all('/events/decline/:eventid', event_decline.perform);
44
 router.all('/events/decline/:eventid', event_decline.perform);
41
 
45