:recycle: clean up response model

backend/lib/models/user.js

@@ -1,6 +1,5 @@
 const Schwifty = require('@hapipal/schwifty')
 
-const ProfileModel = require('./profile')
 const userSchema = require('../schemas/users')
 
 /**
@@ -10,18 +9,6 @@ module.exports = class User extends Schwifty.Model {
     static get tableName() {
         return 'users'
     }
-    static get relationMappings() {
-        return {
-            profiles: {
-                relation: Schwifty.Model.HasManyRelation,
-                modelClass: ProfileModel,
-                join: {
-                    from: 'user.profile_id',
-                    to: 'profiles.profile_id',
-                },
-            },
-        }
-    }
     static get joiSchema() {
         return userSchema.single
     }

backend/lib/routes/user/get-user.js

@@ -1,5 +1,5 @@
-const { responseWrapper } = require('../../schemas/api.js')
-const { validator } = require('../../schemas/users.js')
+const Joi = require('joi')
+const { validator, response } = require('../../schemas/users.js')
 const userHandlers = require('../handlers/user')
 
 const docs = {
@@ -22,7 +22,7 @@ module.exports = {
             failAction: 'log',
         },
         response: {
-            schema: responseWrapper.label('password_res'),
+            schema: response,
             failAction: 'log',
         },
     },

backend/lib/schemas/api.js

@@ -1,11 +0,0 @@
-const Joi = require('joi')
-
-const responseWrapper = Joi.object({
-    ok: Joi.bool(),
-    handler: Joi.string(),
-    data: Joi.object(),
-})
-
-module.exports = {
-    responseWrapper,
-}

backend/lib/schemas/users.js

@@ -5,21 +5,31 @@ const Joi = require('joi')
  * A user record is tied to a single person.
  */
 
+// common fields
+const user_email = Joi.string().required()
+
 // validator is used to validate route input/output
 const validator = Joi.object({
-    user_id: Joi.number(),
-    user_email: Joi.string().required(),
+    user_email,
 }).label('user__single_validator')
 
 // single is used to define database models
 const single = Joi.object({
     user_id: Joi.number(),
-    user_email: Joi.string().required(),
+    user_email,
     is_poster: Joi.number().required(),
     is_verified: Joi.number().required(),
 }).label('user__single')
 
+// response is used to wrap and validate api responses
+const response = Joi.object({
+    ok: Joi.bool(),
+    handler: Joi.string(),
+    data: single,
+}).label('user__single_response')
+
 module.exports = {
     single,
     validator,
+    response,
 }