Merge branch 'brian_dev' of fyindr/siimee into dev

https://siimee.jetbrains.space/p/siimee/issues/89

https://siimee.jetbrains.space/p/siimee/issues/90

backend/db/data-generator/mock.js

@@ -115,6 +115,287 @@ module.exports = {
             tag_id: 5,
             is_deleted: false,
         },
+        {
+            tag_association_id: 10,
+            profile_id: 4,
+            grouping_id: null,
+            tag_id: 1,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 11,
+            profile_id: 5,
+            grouping_id: null,
+            tag_id: 1,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 12,
+            profile_id: 6,
+            grouping_id: null,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 13,
+            profile_id: 7,
+            grouping_id: null,
+            tag_id: 8,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 14,
+            profile_id: 8,
+            grouping_id: null,
+            tag_id: 7,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 15,
+            profile_id: 9,
+            grouping_id: 1,
+            tag_id: 2,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 16,
+            profile_id: 10,
+            grouping_id: 2,
+            tag_id: 2,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 17,
+            profile_id: 11,
+            grouping_id: 2,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 18,
+            profile_id: 12,
+            grouping_id: 3,
+            tag_id: 4,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 19,
+            profile_id: 13,
+            grouping_id: 3,
+            tag_id: 7,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 20,
+            profile_id: 14,
+            grouping_id: 4,
+            tag_id: 6,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 21,
+            profile_id: 15,
+            grouping_id: 1,
+            tag_id: 1,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 22,
+            profile_id: 16,
+            grouping_id: 1,
+            tag_id: 2,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 23,
+            profile_id: 17,
+            grouping_id: null,
+            tag_id: 6,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 24,
+            profile_id: 18,
+            grouping_id: null,
+            tag_id: 8,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 25,
+            profile_id: 19,
+            grouping_id: null,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 26,
+            profile_id: 20,
+            grouping_id: null,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 27,
+            profile_id: 21,
+            grouping_id: 2,
+            tag_id: 1,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 28,
+            profile_id: 22,
+            grouping_id: 2,
+            tag_id: 1,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 29,
+            profile_id: 23,
+            grouping_id: 3,
+            tag_id: 2,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 30,
+            profile_id: 24,
+            grouping_id: 4,
+            tag_id: 4,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 31,
+            profile_id: 25,
+            grouping_id: 5,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 32,
+            profile_id: 26,
+            grouping_id: 1,
+            tag_id: 4,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 33,
+            profile_id: 27,
+            grouping_id: null,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 34,
+            profile_id: 28,
+            grouping_id: null,
+            tag_id: 3,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 35,
+            profile_id: 29,
+            grouping_id: null,
+            tag_id: 7,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 36,
+            profile_id: 30,
+            grouping_id: null,
+            tag_id: 6,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 37,
+            profile_id: 31,
+            grouping_id: 3,
+            tag_id: 4,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 38,
+            profile_id: 32,
+            grouping_id: 3,
+            tag_id: 5,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 39,
+            profile_id: 33,
+            grouping_id: 3,
+            tag_id: 5,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 40,
+            profile_id: 34,
+            grouping_id: 4,
+            tag_id: 7,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 41,
+            profile_id: 35,
+            grouping_id: 4,
+            tag_id: 8,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 42,
+            profile_id: 36,
+            grouping_id: 1,
+            tag_id: 1,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 43,
+            profile_id: 37,
+            grouping_id: 1,
+            tag_id: 2,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 44,
+            profile_id: 38,
+            grouping_id: null,
+            tag_id: 2,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 45,
+            profile_id: 39,
+            grouping_id: null,
+            tag_id: 6,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 46,
+            profile_id: 40,
+            grouping_id: null,
+            tag_id: 5,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 47,
+            profile_id: 41,
+            grouping_id: null,
+            tag_id: 6,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 48,
+            profile_id: 42,
+            grouping_id: 1,
+            tag_id: 8,
+            is_deleted: false,
+        },
+        {
+            tag_association_id: 49,
+            profile_id: 43,
+            grouping_id: 1,
+            tag_id: 7,
+            is_deleted: false,
+        },
+
     ],
     response_keys: [
         {

backend/lib/services/profile/index.js

@@ -357,8 +357,8 @@ module.exports = class ProfileService extends Schmervice.Service {
         await this._setTagLookup()
         let associations = groupingId
             ? await TagAssociation.query()
-                  .where('grouping_id', groupingId)
-                  .andWhere('profile_id', profileId)
+                .where('grouping_id', groupingId)
+                .andWhere('profile_id', profileId)
             : await TagAssociation.query().andWhere('profile_id', profileId)
         return associations
             .map(assoc => ({
@@ -371,10 +371,26 @@ module.exports = class ProfileService extends Schmervice.Service {
                     : true
             })
     }
+
+    /**
+     * Use the db to grab tag associations
+     * by profile, grouping, tag, and insert
+     * it if it already exists
+     * @param {object} association
+     */
     async revealProfileInfo(association) {
         const { TagAssociation } = this.server.models()
-        await TagAssociation.query().insert(association)
 
-        return await this.getTagsFor(association.profile_id)
+        const existingAssociations = await TagAssociation.query()
+            .where('profile_id', `${association.profile_id}`)
+            .where('grouping_id', `${association.grouping_id}`)
+            .where('tag_id', `${association.tag_id}`)
+            .where('is_deleted', 0)
+        if (!existingAssociations.length) {
+            await TagAssociation.query().insert(association)
+            return await this.getTagsFor(association.profile_id)
+        } else {
+            return console.error('tag association already exists')
+        }
     }
 }