WIP server side.

server/src/http/controllers/Views.js

@@ -1,6 +1,6 @@
 import { difference } from 'lodash';
 import express from 'express';
-import { check, validationResult } from 'express-validator';
+import { check, query, validationResult } from 'express-validator';
 import asyncMiddleware from '@/http/middleware/asyncMiddleware';
 import Resource from '@/models/Resource';
 import View from '../../models/View';
@@ -8,10 +8,13 @@ import View from '../../models/View';
 export default {
   resource: 'items',
 
+  /**
+   * Router constructor.
+   */
   router() {
     const router = express.Router();
 
-    router.post('/resource/:resource_id',
+    router.post('/',
       this.createView.validation,
       asyncMiddleware(this.createView.handler));
 
@@ -33,7 +36,9 @@ export default {
    * List all views that associated with the given resource.
    */
   listViews: {
-    validation: [],
+    validation: [
+      query('resource_name').optional().trim().escape(),
+    ],
     async handler(req, res) {
       const { resource_id: resourceId } = req.params;
       const views = await View.where('resource_id', resourceId).fetchAll();
@@ -54,7 +59,6 @@ export default {
           errors: [{ type: 'ROLE_NOT_FOUND', code: 100 }],
         });
       }
-
       return res.status(200).send({ ...view.toJSON() });
     },
   },
@@ -66,25 +70,23 @@ export default {
     validation: [],
     async handler(req, res) {
       const { view_id: viewId } = req.params;
-      const view = await View.where('id', viewId).fetch({
-        withRelated: ['viewRoles', 'columns'],
-      });
+      const view = await View.query().findById(viewId);
 
       if (!view) {
         return res.boom.notFound(null, {
           errors: [{ type: 'VIEW_NOT_FOUND', code: 100 }],
         });
       }
-
-      if (view.attributes.predefined) {
+      if (view.predefined) {
         return res.boom.badRequest(null, {
           errors: [{ type: 'PREDEFINED_VIEW', code: 200 }],
         });
       }
-      // console.log(view);
-      await view.destroy();
-
-      // await view.columns().destroy({ require: false });
+      await Promise.all([
+        view.$relatedQuery('viewRoles').delete(),
+        view.$relatedQuery('columns').delete(),
+      ]);
+      await view.delete();
 
       return res.status(200).send({ id: view.get('id') });
     },
@@ -95,16 +97,17 @@ export default {
    */
   createView: {
     validation: [
+      check('resource_name').exists().escape().trim(),
       check('label').exists().escape().trim(),
-      check('columns').isArray({ min: 3 }),
+      check('columns').exists().isArray({ min: 1 }),
       check('roles').isArray(),
       check('roles.*.field').exists().escape().trim(),
       check('roles.*.comparator').exists(),
       check('roles.*.value').exists(),
       check('roles.*.index').exists().isNumeric().toInt(),
+      check('columns.*').exists().escape().trim(),
     ],
     async handler(req, res) {
-      const { resource_id: resourceId } = req.params;
       const validationErrors = validationResult(req);
 
       if (!validationErrors.isEmpty()) {
@@ -113,7 +116,8 @@ export default {
         });
       }
 
-      const resource = await Resource.where('id', resourceId).fetch();
+      const form = { ...req.body };
+      const resource = await Resource.query().where('name', form.resource_name).first();
 
       if (!resource) {
         return res.boom.notFound(null, {
@@ -121,38 +125,34 @@ export default {
         });
       }
       const errorReasons = [];
-      const { label, roles, columns } = req.body;
+      const fieldsSlugs = form.roles.map((role) => role.field);
 
-      const fieldsSlugs = roles.map((role) => role.field);
+      const resourceFields = await resource.$relatedQuery('fields');
+      const resourceFieldsKeys = resourceFields.map((f) => f.slug);
 
-      const resourceFields = await resource.fields().fetch();
-      const resourceFieldsKeys = resourceFields.map((f) => f.get('key'));
+      // The difference between the stored resource fields and submit fields keys.
       const notFoundFields = difference(fieldsSlugs, resourceFieldsKeys);
 
       if (notFoundFields.length > 0) {
         errorReasons.push({ type: 'RESOURCE_FIELDS_NOT_EXIST', code: 100, fields: notFoundFields });
       }
-
-      const notFoundColumns = difference(columns, resourceFieldsKeys);
+      // The difference between the stored resource fields and the submit columns keys.
+      const notFoundColumns = difference(form.columns, resourceFieldsKeys);
 
       if (notFoundColumns.length > 0) {
-        errorReasons.push({ type: 'COLUMNS_NOT_EXIST', code: 200, fields: notFoundColumns });
+        errorReasons.push({ type: 'COLUMNS_NOT_EXIST', code: 200, columns: notFoundColumns });
       }
-
       if (errorReasons.length > 0) {
         return res.boom.badRequest(null, { errors: errorReasons });
       }
 
-      const view = await View.forge({
-        name: label,
-        predefined: false,
-      });
-
       // Save view details.
-      await view.save();
-
-      // Save view columns.
-
+      const view = await View.query().insert({
+        name: form.label,
+        predefined: false,
+        resource_id: resource.id,
+      });
+      
       // Save view roles.
 
 
@@ -160,7 +160,6 @@ export default {
     },
   },
 
-
   editView: {
     validation: [
       check('label').exists().escape().trim(),