Fix #217 : StateTypeParam are no longer inserted in duplicate

api/core/statetypeparam/index.js

@@ -1,3 +1,4 @@
 
 module.exports.create = require('./stateTypeParam.create.js');
+module.exports.cleanDuplicate = require('./stateTypeParam.cleanDuplicate.js');
 module.exports.getByStateType = require('./stateTypeParam.getByStateType.js');

api/core/statetypeparam/stateTypeParam.cleanDuplicate.js

@@ -0,0 +1,5 @@
+var queries = require('./stateTypeParam.queries.js');
+
+module.exports = function(){
+    return gladys.utils.sql(queries.cleanDuplicateStateTypeParams, []);    
+};

api/core/statetypeparam/stateTypeParam.create.js

@@ -1,4 +1,15 @@
+var queries = require('./stateTypeParam.queries.js');
 
 module.exports = function (stateTypeParam){
-    return StateTypeParam.create(stateTypeParam);
+
+    // test if StateTypeParam already exist
+    return gladys.utils.sql(queries.getByStateTypeAndVariableName, [stateTypeParam.statetype, stateTypeParam.variablename])
+        .then((rows) => {
+
+            // if StateTypeParam already exist, update it
+            if(rows.length) return StateTypeParam.update({id: rows[0].id}, stateTypeParam);
+
+            // if not, update it
+            return StateTypeParam.create(stateTypeParam);
+        })
 };

api/core/statetypeparam/stateTypeParam.queries.js

@@ -1,4 +1,14 @@
 
 module.exports = {
-  getByStateType: 'SELECT * FROM statetypeparam WHERE statetype = ?;'  
+  getByStateType: 'SELECT * FROM statetypeparam WHERE statetype = ?;',
+  getByStateTypeAndVariableName: 'SELECT * FROM statetypeparam WHERE statetype = ? AND variablename = ?;',
+  cleanDuplicateStateTypeParams: `
+    DELETE FROM statetypeparam
+      WHERE id NOT IN 
+      (
+        SELECT MIN(id) as rowId
+        FROM (SELECT * FROM statetypeparam) AS stp
+        GROUP BY variablename, statetype
+      );
+  `
 };

api/core/update/update.getStates.js

@@ -11,6 +11,10 @@ module.exports = function(user) {
 
             if(stateTypes === 'Not Found') return Promise.reject(new Error('Not Found'));
 
-            return gladys.stateType.insertBatch(stateTypes);
+            // Insert all stateTypes
+            return gladys.stateType.insertBatch(stateTypes)
+
+                // then clean duplicate (due to old versions of Gladys :/)
+                .then(() => gladys.stateTypeParam.cleanDuplicate());
         });
 };

test/unit/api/core/statetypeparam/stateTypeParam.cleanDuplicate.test.js

@@ -0,0 +1,21 @@
+var should = require('should');
+var validateStateTypeParam = require('../../validator/stateTypeParamValidator.js');
+
+describe('StateTypeParam', function() {
+
+  describe('cleanDuplicate', function() {
+
+    it('should cleanDuplicate', function (done) {
+
+
+        gladys.stateTypeParam.cleanDuplicate()
+            .then(function(){
+
+                done();
+            }).catch(done);
+
+    });
+
+  });
+
+});

test/unit/api/core/statetypeparam/stateTypeParam.create.test.js

@@ -5,7 +5,7 @@ describe('StateTypeParam', function() {
 
   describe('create', function() {
 
-    it('should return StateTypeParam created', function (done) {
+    it('should return StateTypeParam updated', function (done) {
 
          var stateTypeParam = {
              statetype: 1,
@@ -21,6 +21,23 @@ describe('StateTypeParam', function() {
             }).catch(done);
 
     });
+
+    it('should return StateTypeParam created', function (done) {
+
+        var stateTypeParam = {
+            statetype: 1,
+            variablename: 'test2',
+            name: 'Test'
+        };
+
+       gladys.stateTypeParam.create(stateTypeParam)
+           .then(function(result){
+
+               validateStateTypeParam(result);
+               done();
+           }).catch(done);
+
+   });
 
   });