:sparkles: validating profile id list OR list of profiles | adjusting return format to match other routes

backend/lib/routes/profile/patch-queue.js

@@ -10,9 +10,27 @@ const pluginConfig = {
     },
 }
 
+const responseSchemas = {
+    responses: Joi.array().items(
+        Joi.alternatives().try(
+            Joi.number(),
+            Joi.object({
+                profile_id: Joi.number(),
+                user_id: Joi.number(),
+                responses: Joi.array().items(),
+                user_type: Joi.any(),
+            }),
+        )
+    ),
+    error: Joi.object({
+        error: Joi.string(),
+    }),
+}
+
+
 const validators = {
     params: Joi.object({ profile_id: Joi.number(), target_id: Joi.number() }),
-    query: Joi.object({ reinsert: Joi.boolean() }),
+    query: Joi.object({ include_profile:Joi.bool(), reinsert: Joi.boolean() }),
 }
 
 module.exports = {
@@ -25,14 +43,32 @@ module.exports = {
         auth: false,
         handler: async function (request, h) {
             const { profile_id, target_id } = request.params
-            const { reinsert } = request.query
-            const { matchQueueService } = request.server.services()
-
-            return await matchQueueService.markAsDeleted(
+            const { include_profile, reinsert } = request.query
+            const { profileService, matchQueueService } = request.server.services()
+            const updatedQueue = await matchQueueService.markAsDeleted(
                 profile_id,
                 target_id,
                 reinsert,
             )
+            const queueIds = updatedQueue.map(entry => entry.target_id)
+            const res =  {
+                ok:true,
+                handler: pluginConfig.handlerType,
+                data: queueIds
+            }
+            if(include_profile) {
+                res.data = await profileService.getProfilesFor(queueIds)
+            }
+            try {
+                return h.response(res).code(200)
+            } catch (err) {
+                return h.response({
+                    ok:false,
+                    handler: pluginConfig.handlerType,
+                    data: { error: `${err}`}
+                }).code(409)
+
+            }
         },
         /** Validate based on validators object */
         validate: {
@@ -40,15 +76,20 @@ module.exports = {
             failAction: 'log',
         },
 
-        // couldn't get validate server response working...
-
         /** Validate the server response */
-        // response: {
-        //     schema: Joi.object({
-        //         ok: Joi.bool(),
-        //         handler: Joi.string(),
-        //         data: Joi.object(),
-        //     }),
-        // },
+        response: {
+            status: {
+                200: Joi.object({
+                    ok: Joi.bool(),
+                    handler: Joi.string(),
+                    data: responseSchemas.responses,
+                }),
+                409: Joi.object({
+                    ok: Joi.bool(),
+                    handler: Joi.string(),
+                    data: responseSchemas.error,
+                }),
+            },
+        },
     },
 }

backend/lib/routes/profile/queue.js

@@ -10,6 +10,23 @@ const pluginConfig = {
     },
 }
 
+const responseSchemas = {
+    responses: Joi.array().items(
+        Joi.alternatives().try(
+            Joi.number(),
+            Joi.object({
+                profile_id: Joi.number(),
+                user_id: Joi.number(),
+                responses: Joi.array().items(),
+                user_type: Joi.any(),
+            }),
+        )
+    ),
+    error: Joi.object({
+        error: Joi.string(),
+    }),
+}
+
 const validators = {
     params: Joi.object({ profile_id: Joi.number() }),
     query: Joi.object({ include_profile: Joi.bool() }),
@@ -31,9 +48,25 @@ module.exports = {
 
             const queue = await matchQueueService.getQueue(profile_id)
             const queueIds = queue.map(entry => entry.target_id)
-            return include_profile
-                ? profileService.getProfilesFor(queueIds)
-                : queueIds
+            const res =  {
+                ok:true,
+                handler: pluginConfig.handlerType,
+                data: queueIds
+            }
+            if(include_profile) {
+                res.data = await profileService.getProfilesFor(queueIds)
+            }
+            console.log(res.data)
+            try {
+                return h.response(res).code(200)
+            } catch (err) {
+                return h.response({
+                    ok:false,
+                    handler: pluginConfig.handlerType,
+                    data: { error: `${err}`}
+                }).code(409)
+
+            }
         },
         /** Validate based on validators object */
         validate: {
@@ -41,15 +74,20 @@ module.exports = {
             failAction: 'log',
         },
 
-        // couldn't get validate server response working...
-
         /** Validate the server response */
-        // response: {
-        //     schema: Joi.object({
-        //         ok: Joi.bool(),
-        //         handler: Joi.string(),
-        //         data: Joi.object(),
-        //     }),
-        // },
+        response: {
+            status: {
+                200: Joi.object({
+                    ok: Joi.bool(),
+                    handler: Joi.string(),
+                    data: responseSchemas.responses,
+                }),
+                409: Joi.object({
+                    ok: Joi.bool(),
+                    handler: Joi.string(),
+                    data: responseSchemas.error,
+                }),
+            },
+        },
     },
 }