:recycle: cleaning up schemas and models

backend/lib/models/profile.js

@@ -1,8 +1,9 @@
 const Schwifty = require('@hapipal/schwifty')
-const Joi = require('joi')
-const TagAssociation = require('./tag-association')
-const Response = require('./response')
-const User = require('./user')
+
+const profileSchema = require('../schemas/profile')
+const TagAssociationModel = require('./tag-association')
+const ResponseModel = require('./response')
+const UserModel = require('./user')
 
 module.exports = class Profile extends Schwifty.Model {
     static get tableName() {
@@ -12,7 +13,7 @@ module.exports = class Profile extends Schwifty.Model {
         return {
             tags: {
                 relation: Schwifty.Model.HasManyRelation,
-                modelClass: TagAssociation,
+                modelClass: TagAssociationModel,
                 join: {
                     from: 'tag_associations.profile_id',
                     to: 'profiles.profile_id',
@@ -20,7 +21,7 @@ module.exports = class Profile extends Schwifty.Model {
             },
             responses: {
                 relation: Schwifty.Model.HasManyRelation,
-                modelClass: Response,
+                modelClass: ResponseModel,
                 join: {
                     from: 'responses.profile_id',
                     to: 'profiles.profile_id',
@@ -28,7 +29,7 @@ module.exports = class Profile extends Schwifty.Model {
             },
             user: {
                 relation: Schwifty.Model.BelongsToOneRelation,
-                modelClass: User,
+                modelClass: UserModel,
                 join: {
                     from: 'users.user_id',
                     to: 'profiles.user_id',
@@ -37,9 +38,6 @@ module.exports = class Profile extends Schwifty.Model {
         }
     }
     static get joiSchema() {
-        return Joi.object({
-            profile_id: Joi.number(),
-            user_id: Joi.number(),
-        })
+        return profileSchema.single
     }
 }

backend/lib/models/tag-associations.js → backend/lib/models/tag-association.js

@@ -1,6 +1,6 @@
 const Schwifty = require('@hapipal/schwifty')
 
-const tagSchema = require('../schemas/tags')
+const associationSchema = require('../schemas/tag-associations')
 const Tag = require('./tag')
 
 module.exports = class TagAssociation extends Schwifty.Model {
@@ -20,6 +20,6 @@ module.exports = class TagAssociation extends Schwifty.Model {
         }
     }
     static get joiSchema() {
-        return tagSchema.association
+        return associationSchema.single
     }
 }

backend/lib/models/tags.js

@@ -1,4 +1,5 @@
 const Schwifty = require('@hapipal/schwifty')
+
 const tagSchema = require('../schemas/tags')
 
 module.exports = class Tag extends Schwifty.Model {

backend/lib/models/user.js

@@ -1,6 +1,8 @@
-const { single } = require('../schemas/user')
 const Schwifty = require('@hapipal/schwifty')
 
+const ProfileModel = require('../profiles')
+const userSchema = require('../schemas/users')
+
 /**
  * @typedef User
  */
@@ -8,7 +10,19 @@ 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 single
+        return userSchema.single
     }
 }

backend/lib/schemas/media.js

@@ -0,0 +1,19 @@
+const Joi = require('joi')
+
+const validator = Joi.object({
+    profile_id: Joi.number(),
+    media_url: Joi.string().required(),
+    media_type_url: Joi.string().required(),
+}).label('media__single_validator')
+
+const single = Joi.object({
+    profile_id: Joi.number(),
+    media_url: Joi.string().required(),
+    media_type: Joi.string().required(),
+    _is_deleted: Joi.number().required(),
+}).label('media__single')
+
+module.exports = {
+    single,
+    validator,
+}

backend/lib/schemas/memberships.js

@@ -0,0 +1,18 @@
+const validator = Joi.object({
+    membership_id: Joi.number(),
+    profile_id: Joi.number(),
+    grouping_id: Joi.number(),
+}).label('membership__single_validator')
+
+// single is used to define database models
+const single = Joi.object({
+    membership_id: Joi.number(),
+    profile_id: Joi.number(),
+    grouping_id: Joi.number(),
+    _is_deleted: Joi.number(),
+}).label('membership__single')
+
+module.exports = {
+    single,
+    validator,
+}

backend/lib/schemas/profile.js

@@ -0,0 +1,35 @@
+const Joi = require('joi')
+// const surveyResponseSchema = require('./responses')
+const userSchema = require('./users')
+const associationSchema = require('./tag-associations')
+
+/**
+ * Profiles
+ * A profile links a human user to multiple
+ * job seeking or job posting profiles.
+ */
+
+// validator is used to validate route input/output
+const validator = Joi.object({
+    profile_id: Joi.number(),
+    user: userSchema.single,
+    // responses: surveyResponseSchema.list,
+    // reveal: Joi.array().items(),
+    tags: associationSchema.list,
+    profile_description: Joi.string().allow(null, ''),
+}).label('profile__single_validator')
+
+const list = Joi.array().items(validator).label('profile__list')
+
+// single is used to define database models
+const single = Joi.object({
+    profile_id: Joi.number(),
+    user_id: Joi.number(),
+    _is_deleted: Joi.number(),
+}).label('profile__single')
+
+module.exports = {
+    single,
+    validator,
+    list,
+}

backend/lib/schemas/tag-associations.js

@@ -0,0 +1,32 @@
+const Joi = require('joi')
+
+/**
+ * Tag Associations
+ * An association is a record linking a
+ * profile or grouping to a tag.
+ */
+
+// validator is used to validate route input/output
+const validator = Joi.object({
+    tag_association_id: Joi.number(),
+    profile_id: Joi.number().required(),
+    grouping_id: Joi.number(),
+    tag_id: Joi.number().required(),
+}).label('association__single_validator')
+
+const list = Joi.array().items(single).label('association__list')
+
+// single is used to define database models
+const single = Joi.object({
+    tag_association_id: Joi.number(),
+    profile_id: Joi.number().required(),
+    grouping_id: Joi.number(),
+    tag_id: Joi.number().required(),
+    _is_deleted: Joi.boolean().required(),
+}).label('association__single')
+
+module.exports = {
+    single,
+    validator,
+    list,
+}

backend/lib/schemas/tags.js

@@ -0,0 +1,30 @@
+const Joi = require('joi')
+
+/**
+ * Tags
+ * A tag describes some attribute to be
+ * associated with a profile or grouping.
+ */
+
+// validator is used to validate route input/output
+const validator = Joi.object({
+    tag_id: Joi.number(),
+    tag_category: Joi.string(),
+    tag_description: Joi.string(),
+}).label('tag__single_validator')
+
+const list = Joi.array().items(validator).label('tag__list')
+
+// single is used to define database models
+const single = Joi.object({
+    tag_id: Joi.number(),
+    tag_category: Joi.string(),
+    tag_description: Joi.string(),
+    _is_active: Joi.number().required(),
+}).label('tag__single')
+
+module.exports = {
+    single,
+    validator,
+    list
+}

backend/lib/schemas/user.js

@@ -1,12 +0,0 @@
-const Joi = require('joi')
-
-module.exports = {
-    single: Joi.object({
-        user_id: Joi.number(),
-        user_name: Joi.string(),
-        user_email: Joi.string().required(),
-        is_poster: Joi.number().required(),
-        is_admin: Joi.number().required(),
-        is_verified: Joi.number().required(),
-    }).label('user_single'),
-}

backend/lib/schemas/users.js

@@ -0,0 +1,25 @@
+const Joi = require('joi')
+
+/**
+ * Users
+ * A user record is tied to a single person.
+ */
+
+// validator is used to validate route input/output
+const validator = Joi.object({
+    user_id: Joi.number(),
+    user_email: Joi.string().required(),
+}).label('user__single_validator')
+
+// single is used to define database models
+const single = Joi.object({
+    user_id: Joi.number(),
+    user_email: Joi.string().required(),
+    is_poster: Joi.number().required(),
+    is_verified: Joi.number().required(),
+}).label('user__single')
+
+module.exports = {
+    single,
+    validator,
+}