Просмотр исходного кода

:recycle: adjusted grouping return for matches

tags/0.0.1
J 4 лет назад
Родитель
Сommit
7105a69e8f
1 измененных файлов: 10 добавлений и 3 удалений
  1. 10
    3
      backend/lib/services/membership.js

+ 10
- 3
backend/lib/services/membership.js Просмотреть файл

10
      * @param {number} profileId
10
      * @param {number} profileId
11
      * @returns {Array} List of all grouping_ids for user
11
      * @returns {Array} List of all grouping_ids for user
12
      */
12
      */
13
-    async _getGroupingIdsForProfileId(profileId, type) {
13
+    async _getGroupingIdsForProfileId(profileId, type, active) {
14
         const { Membership } = this.server.models()
14
         const { Membership } = this.server.models()
15
 
15
 
16
         /** Grab every Membership associated with this id */
16
         /** Grab every Membership associated with this id */
17
         let allMemberships
17
         let allMemberships
18
 
18
 
19
-        if(type) {
19
+        if(type && active == 'any') {
20
+            allMemberships = await Membership.query()
21
+                .where({ profile_id: profileId })
22
+                .where({ membership_type: type })
23
+        } else if (type) {
20
             allMemberships = await Membership.query()
24
             allMemberships = await Membership.query()
21
                 .where({ profile_id: profileId })
25
                 .where({ profile_id: profileId })
22
                 .where({ membership_type: type })
26
                 .where({ membership_type: type })
23
                 .where({ is_active: true })
27
                 .where({ is_active: true })
28
+        } else if(active == 'any') {
29
+            allMemberships = await Membership.query()
30
+                .where({ profile_id: profileId })
24
         } else {
31
         } else {
25
             allMemberships = await Membership.query()
32
             allMemberships = await Membership.query()
26
                 .where({ profile_id: profileId })
33
                 .where({ profile_id: profileId })
74
     async findGroupingsByProfileId(profileId, type) {
81
     async findGroupingsByProfileId(profileId, type) {
75
         const { Grouping } = this.server.models()
82
         const { Grouping } = this.server.models()
76
 
83
 
77
-        const dedupedGroupings = await this._getGroupingIdsForProfileId(profileId, type)
84
+        const dedupedGroupings = await this._getGroupingIdsForProfileId(profileId, type, 'any')
78
 
85
 
79
         /** Grab just the Groupings this id has a Membership for */
86
         /** Grab just the Groupings this id has a Membership for */
80
         return await Grouping.query()
87
         return await Grouping.query()

Загрузка…
Отмена
Сохранить