:recycle: tweaking response schemas

backend/lib/schemas/groupings.js

@@ -0,0 +1,26 @@
+const Joi = require('joi')
+
+const profileSchema = require('./profiles')
+
+const validator = Joi.object({
+    grouping_id: Joi.number(),
+    grouping_name: Joi.string(),
+    grouping_type: Joi.string(),
+    is_paired: Joi.boolean(),
+    profile: profileSchema.validator,
+}).label('grouping__single_validator')
+
+const list = Joi.array().items(validator).label('grouping__list_validator')
+
+const single = Joi.object({
+    grouping_id: Joi.number(),
+    grouping_name: Joi.string(),
+    grouping_type: Joi.string(),
+    is_paired: Joi.boolean(),
+}).label('grouping__single')
+
+module.exports = {
+    single,
+    validator,
+    list,
+}

backend/lib/schemas/profile.js

@@ -19,7 +19,7 @@ const validator = Joi.object({
     profile_description: Joi.string().allow(null, ''),
 }).label('profile__single_validator')
 
-const list = Joi.array().items(validator).label('profile__list')
+const list = Joi.array().items(validator).label('profile__list_validator')
 
 // single is used to define database models
 const single = Joi.object({

backend/lib/schemas/response-keys.js

@@ -1,17 +1,24 @@
-const singleResponseKey = Joi.object({
+const Joi = require('joi')
+
+const validator = Joi.object({
     response_key_id: Joi.number().required(),
     response_key_category: Joi.string().required(),
     response_key_prompt: Joi.string().required(),
-    response_key_description: Joi.any(),
-    aspect: Joi.string().allow(null, ''),
-    category: Joi.string().allow(null, ''),
-    placeholder: Joi.string().allow(null, ''),
-    invalidInputPrompt: Joi.string().allow(null, ''),
-}).label('question_single')
+    response_key_description: Joi.any()
+}).label('question__single_validator')
+
+const list = Joi.array().items(validator).label('question__list_validator')
+
+const single = Joi.object({
+    response_key_id: Joi.number().required(),
+    response_key_category: Joi.string().required(),
+    response_key_prompt: Joi.string().required(),
+    response_key_description: Joi.any()
+}).label('question__single')
+
 
 module.exports = {
-    single: singleResponse,
-    list: Joi.array().items(singleResponse).label('response_list'),
-    key: singleResponseKey,
-    keys: Joi.array().items(singleResponseKey).label('question_list'),
+    single,
+    validator,
+    list
 }

backend/lib/schemas/responses.js

@@ -1,26 +1,23 @@
 const Joi = require('joi')
 
-const singleResponse = Joi.object({
+const validator = Joi.object({
     response_key_id: Joi.number(),
     response_id: Joi.number(),
     profile_id: Joi.number(),
     val: Joi.string().allow(null, ''),
-}).label('response_single')
+}).label('response__single_validator')
 
-const singleResponseKey = Joi.object({
-    response_key_id: Joi.number().required(),
-    response_key_category: Joi.string().required(),
-    response_key_prompt: Joi.string().required(),
-    response_key_description: Joi.any(),
-    aspect: Joi.string().allow(null, ''),
-    category: Joi.string().allow(null, ''),
-    placeholder: Joi.string().allow(null, ''),
-    invalidInputPrompt: Joi.string().allow(null, ''),
-}).label('question_single')
+const list = Joi.array().items(validator).label('response__list_validator')
+
+const single = Joi.object({
+    response_key_id: Joi.number(),
+    response_id: Joi.number(),
+    profile_id: Joi.number(),
+    val: Joi.string().allow(null, ''),
+}).label('response__single')
 
 module.exports = {
-    single: singleResponse,
-    list: Joi.array().items(singleResponse).label('response_list'),
-    key: singleResponseKey,
-    keys: Joi.array().items(singleResponseKey).label('question_list'),
+    single,
+    validator,
+    list,
 }

backend/lib/schemas/tag-associations.js

@@ -14,7 +14,7 @@ const validator = Joi.object({
     tag_id: Joi.number().required(),
 }).label('association__single_validator')
 
-const list = Joi.array().items(single).label('association__list')
+const list = Joi.array().items(single).label('association__list_validator')
 
 // single is used to define database models
 const single = Joi.object({

backend/lib/schemas/tags.js

@@ -13,7 +13,7 @@ const validator = Joi.object({
     tag_description: Joi.string(),
 }).label('tag__single_validator')
 
-const list = Joi.array().items(validator).label('tag__list')
+const list = Joi.array().items(validator).label('tag__list_validator')
 
 // single is used to define database models
 const single = Joi.object({
@@ -26,5 +26,5 @@ const single = Joi.object({
 module.exports = {
     single,
     validator,
-    list
+    list,
 }