feat(*): add parameters to schema

infra-geo-ouverte · Feb 24, 2017 · 989d033 · 989d033
1 parent c110e81
commit 989d033
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 51 deletions.
diff --git a/src/contexts/context.model.ts b/src/contexts/context.model.ts
@@ -14,7 +14,7 @@ interface Map {
 };
 
 export interface IContext  {
-    alias: string;
+    name: string;
     scope: Scope;
     title: string;
     icon: string;
@@ -26,7 +26,7 @@ export interface ContextInstance extends Sequelize.Instance<IContext> {
   createdAt: Date;
   updatedAt: Date;
 
-  alias: string;
+  name: string;
   scope: Scope;
   title: string;
   icon: string;
@@ -44,11 +44,13 @@ export default function define(sequelize: Sequelize.Sequelize, DataTypes) {
             'primaryKey': true,
             'autoIncrement': true
         },
-        'alias': {
-            'type': DataTypes.STRING(64)
+        'name': {
+            'type': DataTypes.STRING(64),
+            'allowNull': false
         },
         'title': {
-            'type': DataTypes.STRING(128)
+            'type': DataTypes.STRING(128),
+            'allowNull': false
         },
         'icon': {
             'type': DataTypes.STRING(128)

diff --git a/src/contexts/context.test.ts b/src/contexts/context.test.ts
@@ -37,7 +37,8 @@ Server.init(serverConfigs).then((server) => {
           method: 'POST',
           url: '/contexts',
           payload: {
-            alias: 'dummy',
+            name: 'dummy',
+            title: 'dummy',
             scope: 'private',
             map: {}
           }

diff --git a/src/contexts/context.validator.ts b/src/contexts/context.validator.ts
@@ -2,8 +2,8 @@ import * as Joi from 'joi';
 
 export const createContextModel = Joi.object().keys({
   scope: Joi.string().required().valid('public', 'protected', 'private'),
-  alias: Joi.string(),
-  title: Joi.string(),
+  name: Joi.string().required(),
+  title: Joi.string().required(),
   icon: Joi.string(),
   map:  Joi.object().required().keys({
     view: Joi.object().keys({
@@ -15,7 +15,7 @@ export const createContextModel = Joi.object().keys({
 
 export const updateContextModel = Joi.object().keys({
     scope: Joi.string().valid('public', 'protected', 'private'),
-    alias: Joi.string(),
+    name: Joi.string(),
     title: Joi.string(),
     icon: Joi.string(),
     map:  Joi.object().keys({

diff --git a/src/layers/layer.model.ts b/src/layers/layer.model.ts
@@ -1,27 +1,35 @@
 import * as Sequelize from 'sequelize';
 
-interface PropertiesLayer {
+interface ViewLayer {
   attribution: string;
   minZoom: number;
   maxZoom: number;
 };
 
+interface SourceLayer {
+  url: string;
+};
+
 export interface ILayer  {
-    name: string;
+    title: string;
+    type: string;
     url: string;
     protected: boolean;
-    properties: PropertiesLayer;
+    view: ViewLayer;
+    source: SourceLayer;
 };
 
 export interface LayerInstance extends Sequelize.Instance<ILayer> {
   id: string;
   createdAt: Date;
   updatedAt: Date;
 
-  name: string;
+  title: string;
+  type: string;
   url: string;
   protected: boolean;
-  properties: PropertiesLayer;
+  view: ViewLayer;
+  source: SourceLayer;
 }
 
 export interface LayerModel
@@ -36,8 +44,13 @@ export default function define(sequelize: Sequelize.Sequelize, DataTypes) {
             'primaryKey': true,
             'autoIncrement': true
         },
-        'name': {
-            'type': DataTypes.STRING(64)
+        'title': {
+            'type': DataTypes.STRING(64),
+            'allowNull': false
+        },
+        'type': {
+            'type': DataTypes.STRING(32),
+            'allowNull': false
         },
         'url': {
             'type': DataTypes.STRING(255),
@@ -48,13 +61,22 @@ export default function define(sequelize: Sequelize.Sequelize, DataTypes) {
         'protected': {
             'type': DataTypes.BOOLEAN
         },
-        'properties': {
+        'view': {
+            'type': DataTypes.TEXT,
+            'get': function() {
+                return JSON.parse(this.getDataValue('view'));
+            },
+            'set': function(val) {
+                this.setDataValue('view', JSON.stringify({}));
+            }
+        },
+        'source': {
             'type': DataTypes.TEXT,
             'get': function() {
-                return JSON.parse(this.getDataValue('properties'));
+                return JSON.parse(this.getDataValue('source'));
             },
             'set': function(val) {
-                this.setDataValue('properties', JSON.stringify({}));
+                this.setDataValue('source', JSON.stringify({}));
             }
         }
     },

diff --git a/src/layers/layer.test.ts b/src/layers/layer.test.ts
@@ -37,9 +37,11 @@ Server.init(serverConfigs).then((server) => {
           method: 'POST',
           url: '/layers',
           payload: {
-            name: 'dummy',
+            title: 'dummy',
+            type: 'osm',
             protected: false,
-            properties: {}
+            view: {},
+            source: {}
           }
       };
       server.inject(options, function(response) {

diff --git a/src/layers/layer.validator.ts b/src/layers/layer.validator.ts
@@ -1,23 +1,31 @@
 import * as Joi from 'joi';
 
 export const createLayerModel = Joi.object().keys({
-  name: Joi.string().max(64),
+  title: Joi.string().required().max(64),
+  type: Joi.string().required().max(32),
   url: Joi.string(),
   protected: Joi.boolean(),
-  properties:  Joi.object().required().keys({
+  view:  Joi.object().required().keys({
     attribution: Joi.string(),
     minZoom: Joi.number(),
     maxZoom: Joi.number()
+  }),
+  source:  Joi.object().required().keys({
+    url: Joi.string()
   })
 });
 
 export const updateLayerModel = Joi.object().keys({
-    name: Joi.string().max(64),
+    title: Joi.string().max(64),
+    type: Joi.string().max(32),
     url: Joi.string(),
     protected: Joi.boolean(),
-    properties:  Joi.object().required().keys({
+    view:  Joi.object().required().keys({
       attribution: Joi.string(),
       minZoom: Joi.number(),
       maxZoom: Joi.number()
+    }),
+    source:  Joi.object().required().keys({
+      url: Joi.string()
     })
 });
diff --git a/src/tools/tool.model.ts b/src/tools/tool.model.ts
@@ -1,16 +1,12 @@
 import * as Sequelize from 'sequelize';
 
-interface PropertiesTool {
-  attribution: string;
-  minZoom: number;
-  maxZoom: number;
-};
-
 export interface ITool  {
     name: string;
-    url: string;
+    title: string;
+    icon?: string;
+    url?: string;
     protected: boolean;
-    properties: PropertiesTool;
+    options?: {[key: string]: any};
 };
 
 export interface ToolInstance extends Sequelize.Instance<ITool> {
@@ -19,9 +15,11 @@ export interface ToolInstance extends Sequelize.Instance<ITool> {
   updatedAt: Date;
 
   name: string;
-  url: string;
+  title: string;
+  icon?: string;
+  url?: string;
   protected: boolean;
-  properties: PropertiesTool;
+  options?: {[key: string]: any};
 }
 
 export interface ToolModel
@@ -37,7 +35,15 @@ export default function define(sequelize: Sequelize.Sequelize, DataTypes) {
             'autoIncrement': true
         },
         'name': {
-            'type': DataTypes.STRING(64)
+            'type': DataTypes.STRING(64),
+            'allowNull': false
+        },
+        'title': {
+            'type': DataTypes.STRING(64),
+            'allowNull': false
+        },
+        'icon': {
+            'type': DataTypes.STRING(128)
         },
         'url': {
             'type': DataTypes.STRING(255),
@@ -48,13 +54,13 @@ export default function define(sequelize: Sequelize.Sequelize, DataTypes) {
         'protected': {
             'type': DataTypes.BOOLEAN
         },
-        'properties': {
+        'options': {
             'type': DataTypes.TEXT,
             'get': function() {
-                return JSON.parse(this.getDataValue('properties'));
+                return JSON.parse(this.getDataValue('options'));
             },
             'set': function(val) {
-                this.setDataValue('properties', JSON.stringify({}));
+                this.setDataValue('options', JSON.stringify({}));
             }
         }
     },

diff --git a/src/tools/tool.test.ts b/src/tools/tool.test.ts
@@ -38,8 +38,9 @@ Server.init(serverConfigs).then((server) => {
           url: '/tools',
           payload: {
             name: 'dummy',
+            title: 'dummy',
             protected: false,
-            properties: {}
+            options: {}
           }
       };
       server.inject(options, function(response) {

diff --git a/src/tools/tool.validator.ts b/src/tools/tool.validator.ts
@@ -1,23 +1,19 @@
 import * as Joi from 'joi';
 
 export const createToolModel = Joi.object().keys({
-  name: Joi.string().max(64),
+  name: Joi.string().required().max(64),
+  title: Joi.string().required().max(64),
+  icon: Joi.string().max(128),
   url: Joi.string(),
   protected: Joi.boolean(),
-  properties:  Joi.object().required().keys({
-    attribution: Joi.string(),
-    minZoom: Joi.number(),
-    maxZoom: Joi.number()
-  })
+  options:  Joi.object().required()
 });
 
 export const updateToolModel = Joi.object().keys({
     name: Joi.string().max(64),
+    title: Joi.string().max(64),
+    icon: Joi.string().max(128),
     url: Joi.string(),
     protected: Joi.boolean(),
-    properties:  Joi.object().required().keys({
-      attribution: Joi.string(),
-      minZoom: Joi.number(),
-      maxZoom: Joi.number()
-    })
+    options:  Joi.object().required()
 });