Explorar el Código

:recycle: returning only groups with active memberships

tags/0.0.1
J hace 4 años
padre
commit
92b0cec38f

+ 1
- 1
backend/db/mock.js Ver fichero

@@ -723,7 +723,7 @@ module.exports = {
723 723
             grouping_id: 5,
724 724
             membership_type: 'participant',
725 725
             can_edit: false,
726
-            is_active: true,
726
+            is_active: false,
727 727
         },
728 728
     ],
729 729
     groupings: [

+ 2
- 2
backend/lib/routes/membership/active.js Ver fichero

@@ -15,7 +15,7 @@ const validators = {
15 15
     // headers: true,
16 16
 
17 17
     /** Validate the route params (/active/{thing}) */
18
-    params: Joi.object({ user_id: Joi.number() }),
18
+    params: Joi.object({ profile_id: Joi.number() }),
19 19
 
20 20
     /** Validate the route query (/active/{thing}?limit=10&offset=10) */
21 21
     // query: true,
@@ -34,7 +34,7 @@ const responseSchemas = {
34 34
 
35 35
 module.exports = {
36 36
     method: 'GET',
37
-    path: '/active/{profile_id}',
37
+    path: '/{profile_id}',
38 38
     options: {
39 39
         ...pluginConfig.docs,
40 40
         tags: ['api'],

+ 4
- 5
backend/lib/services/membership.js Ver fichero

@@ -14,11 +14,10 @@ module.exports = class MembershipService extends Schmervice.Service {
14 14
         const { Membership } = this.server.models()
15 15
 
16 16
         /** Grab every Membership associated with this id */
17
-        const allMemberships = await Membership.query().where(
18
-            'profile_id',
19
-            profileId,
20
-        )
21
-
17
+        const allMemberships = await Membership.query()
18
+            .where({ profile_id: profileId })
19
+            .where({ is_active: true })
20
+        
22 21
         /** Copy a list of the just the Groupings */
23 22
         const groupingIdsToGrab = allMemberships.map(
24 23
             membership => membership.grouping_id,

Loading…
Cancelar
Guardar