- Added lookupModel property in most controller calls to allow using a ManyToMany model.

gfzabarino · gfzabarino · commit 3c73d6e5cf40 · 2014-11-07T19:04:28.000-03:00
- Added tables creation and migration scripts.
- Changed getRefIdField (routeHelper.js) method to return 'fileId' for any model name that contains 'File' on its name.
- Fixed swaggerTestHelper to allow definitions without a required setting.
diff --git a/api/controllers/challenges.js b/api/controllers/challenges.js
@@ -12,6 +12,7 @@
 
 var datasource = require('./../../datasource').getDataSource();
 var Challenge = datasource.Challenge;
+var ChallengeFile = datasource.ChallengeFile;
 var File = datasource.File;
 var Participant = datasource.Participant;
 var Submission = datasource.Submission;
@@ -20,21 +21,21 @@ var controllerHelper = require('./../../lib/controllerHelper');
 
 
 // build controller for challenge resource
-var challengeController = controllerHelper.buildController(Challenge, null, {filtering: true});
+var challengeController = controllerHelper.buildController(Challenge, null, null, {filtering: true});
 
 
 var filteringOff = {
   filtering: false
 };
 
 // build controller for the nested files resource
-var fileController = controllerHelper.buildController(File, [Challenge], filteringOff);
+var fileController = controllerHelper.buildController(File, [Challenge], ChallengeFile, filteringOff);
 
 // build controller for the nested participants resource
-var participantController = controllerHelper.buildController(Participant, [Challenge], {filtering: true});
+var participantController = controllerHelper.buildController(Participant, [Challenge], null, {filtering: true});
 
 // build controller for the nested submissions resource
-var submissionController = controllerHelper.buildController(Submission, [Challenge], filteringOff);
+var submissionController = controllerHelper.buildController(Submission, [Challenge], null, filteringOff);
 
 
 
diff --git a/api/controllers/files.js b/api/controllers/files.js
@@ -11,16 +11,27 @@
 
 
 var datasource = require('./../../datasource').getDataSource();
-var Challenge = datasource.Challenge;
+//var Challenge = datasource.Challenge;
+//var ChallengeFile = datasource.ChallengeFile;
 var Submission = datasource.Submission;
+var SubmissionFile = datasource.SubmissionFile;
 var File = datasource.File;
 var controllerHelper = require('./../../lib/controllerHelper');
 
 
 // build controller for the nested files resource
-var fileController = controllerHelper.buildController(File, [Challenge, Submission], {filtering: false});
+var fileController = controllerHelper.buildController(File, [Submission], SubmissionFile, {filtering: false});
 
+//// build controller for the nested files resource
+//var fileController = controllerHelper.buildController(File, [{
+//  manyToManyModel: ChallengeFile,
+//  referenceModel: Challenge
+//}, {
+//  manyToManyModel: SubmissionFile,
+//  referenceModel: Submission
+//}], {filtering: false});
 
+//SELECT * FROM Files WHERE id IN (SELECT fileId FROM ChallengeFile WHERE challengeId = ?)
 module.exports = {
   getFiles: fileController.all,
   addFile: fileController.create,
diff --git a/api/controllers/requirements.js b/api/controllers/requirements.js
@@ -17,7 +17,7 @@ var controllerHelper = require('./../../lib/controllerHelper');
 
 
 // build controller for the nested files resource
-var requirementController = controllerHelper.buildController(Requirement, [Challenge], {filtering: false});
+var requirementController = controllerHelper.buildController(Requirement, [Challenge], null, {filtering: false});
 
 
 module.exports = {
diff --git a/api/controllers/scorecardItems.js b/api/controllers/scorecardItems.js
@@ -24,7 +24,7 @@ var options = {
 
 
 // build controller for the nested scorecardItems resource
-var scorecardItemController = controllerHelper.buildController(ScorecardItem, [Challenge, Scorecard], options);
+var scorecardItemController = controllerHelper.buildController(ScorecardItem, [Challenge, Scorecard], null, options);
 
 
 module.exports = {
diff --git a/api/controllers/scorecards.js b/api/controllers/scorecards.js
@@ -17,7 +17,7 @@ var controllerHelper = require('./../../lib/controllerHelper');
 
 
 // build controller for the nested scorecards resource
-var scorecardController = controllerHelper.buildController(Scorecard, [Challenge], {filtering: false});
+var scorecardController = controllerHelper.buildController(Scorecard, [Challenge], null, {filtering: false});
 
 
 module.exports = {
diff --git a/api/models/challenge.js b/api/models/challenge.js
@@ -55,7 +55,7 @@ module.exports = function(sequelize, DataTypes) {
   }, {
     tableName : 'challenges',
     associate : function(models) {
-      Challenge.hasMany(models.File);
+      Challenge.hasMany(models.ChallengeFile);
       Challenge.hasMany(models.Participant);
       Challenge.hasMany(models.Submission);
       Challenge.hasMany(models.Scorecard);
diff --git a/api/models/challengeFile.js b/api/models/challengeFile.js
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2014 TopCoder, Inc. All rights reserved.
+ */
+/**
+ * Represent File in the system.
+ *
+ * @author gfzabarino
+ */
+'use strict';
+
+/**
+ * Defining ChallengeFile model
+ */
+module.exports = function(sequelize, DataTypes) {
+  var ChallengeFile = sequelize.define('ChallengeFile', {
+    challengeId: {
+      type: DataTypes.BIGINT, primaryKey: true,
+      get: function() {
+        return parseInt(this.getDataValue('challengeId'));
+      }
+    },
+    fileId: {
+      type: DataTypes.BIGINT, primaryKey: true,
+      get: function() {
+        return parseInt(this.getDataValue('fileId'));
+      }
+    },
+
+  }, {
+    tableName : 'challenge_files',
+    associate : function(models) {
+      ChallengeFile.belongsTo(models.Challenge, {foreignKey : 'challengeId'});
+      ChallengeFile.belongsTo(models.File, {foreignKey : 'fileId'});
+    }
+  });
+
+  return ChallengeFile;
+
+};
diff --git a/api/models/file.js b/api/models/file.js
@@ -21,18 +21,6 @@ module.exports = function(sequelize, DataTypes) {
         return parseInt(this.getDataValue('id'));
       }
     },
-    challengeId: {
-      type: DataTypes.BIGINT, allowNull: false,
-      get: function() {
-        return parseInt(this.getDataValue('challengeId'));
-      }
-    },
-    submissionId: {
-      type: DataTypes.BIGINT, allowNull: false,
-      get: function() {
-        return parseInt(this.getDataValue('submissionId'));
-      }
-    },
     title : {type: DataTypes.TEXT},
     filePath : {type: DataTypes.TEXT, allowNull: false},
     size : {
@@ -54,9 +42,8 @@ module.exports = function(sequelize, DataTypes) {
   }, {
     tableName : 'files',
     associate : function(models) {
-      File.belongsTo(models.Challenge, {foreignKey : 'challengeId'});
-      File.belongsTo(models.Submission, {foreignKey : 'submissionId'});
-
+      File.hasMany(models.ChallengeFile);
+      File.hasMany(models.SubmissionFile);
     }
   });
 
diff --git a/api/models/submission.js b/api/models/submission.js
@@ -39,7 +39,7 @@ module.exports = function(sequelize, DataTypes) {
   }, {
     tableName : 'submissions',
     associate : function(models) {
-      Submission.hasMany(models.File);
+      Submission.hasMany(models.SubmissionFile);
       Submission.hasMany(models.Scorecard);
       Submission.belongsTo(models.User, {foreignKey : 'submitterId'});
       Submission.belongsTo(models.Challenge, {foreignKey : 'challengeId'});
diff --git a/api/models/submissionFile.js b/api/models/submissionFile.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2014 TopCoder, Inc. All rights reserved.
+ */
+/**
+ * Represent File in the system.
+ *
+ * @author gfzabarino
+ */
+'use strict';
+
+/**
+ * Defining ChallengeFile model
+ */
+module.exports = function(sequelize, DataTypes) {
+  var SubmissionFile = sequelize.define('SubmissionFile', {
+    submissionId: {
+      type: DataTypes.BIGINT, primaryKey: true,
+      get: function() {
+        return parseInt(this.getDataValue('submissionId'));
+      }
+    },
+    fileId: {
+      type: DataTypes.BIGINT, primaryKey: true,
+      get: function() {
+        return parseInt(this.getDataValue('fileId'));
+      }
+    }
+  }, {
+    tableName : 'submission_files',
+    associate : function(models) {
+      SubmissionFile.belongsTo(models.Submission, {foreignKey : 'submissionId'});
+      SubmissionFile.belongsTo(models.File, {foreignKey : 'fileId'});
+    }
+  });
+
+  return SubmissionFile;
+
+};
diff --git a/config/schema-migrations/20141010160840-tables.js b/config/schema-migrations/20141010160840-tables.js
@@ -40,9 +40,7 @@ exports.up = function (db, callback) {
         '"createdAt" timestamp with time zone NOT NULL, ' +
         '"updatedAt" timestamp with time zone NOT NULL, ' +
         '"createdBy" character varying(128), ' +
-        '"updatedBy" character varying(128), ' +
-        '"submissionId" bigint, ' +
-        '"challengeId" bigint NOT NULL ' +
+        '"updatedBy" character varying(128) ' +
       ');'),
     db.runSql.bind(db, 'ALTER TABLE ONLY files ADD CONSTRAINT files_pkey PRIMARY KEY (id);'),
 
diff --git a/config/schema-migrations/20141106235712-files-tables.js b/config/schema-migrations/20141106235712-files-tables.js
@@ -0,0 +1,54 @@
+var dbm = require('db-migrate');
+var type = dbm.dataType;
+var async = require('async');
+
+exports.up = function(db, callback) {
+
+  async.series([
+    function (callback) {
+      // challenge files table
+      db.createTable('challenge_files', {
+        columns: {
+          '"fileId"': {type: 'int', primaryKey: true},
+          '"challengeId"': {type: 'int', primaryKey: true}
+        },
+        ifNotExists: true
+      }, callback);
+    }, function (callback) {
+      // submission files table
+      db.createTable('submission_files', {
+        columns: {
+          '"fileId"': {type: 'int', primaryKey: true},
+          '"submissionId"': {type: 'int', primaryKey: true}
+        },
+        ifNotExists: true
+      }, callback);
+    }, function (callback) {
+      db.runSql('ALTER TABLE challenge_files ADD CONSTRAINT challenge_fk FOREIGN KEY ("challengeId") REFERENCES challenges (id) ON UPDATE CASCADE ON DELETE CASCADE;', callback);
+    }, function (callback) {
+      db.runSql('ALTER TABLE submission_files ADD CONSTRAINT submission_fk FOREIGN KEY ("submissionId") REFERENCES submissions (id) ON UPDATE CASCADE ON DELETE CASCADE;', callback);
+    }, function (callback) {
+      db.runSql('ALTER TABLE challenge_files ADD CONSTRAINT file_fk FOREIGN KEY ("fileId") REFERENCES files (id) ON UPDATE CASCADE ON DELETE CASCADE;', callback);
+    }, function (callback) {
+      db.runSql('ALTER TABLE submission_files ADD CONSTRAINT file_fk FOREIGN KEY ("fileId") REFERENCES files (id) ON UPDATE CASCADE ON DELETE CASCADE;', callback);
+    }, function (callback) {
+      db.runSql('ALTER TABLE challenge_files ADD COLUMN "createdAt" timestamp with time zone NOT NULL;', callback);
+    }, function (callback) {
+      db.runSql('ALTER TABLE challenge_files ADD COLUMN "updatedAt" timestamp with time zone NOT NULL;', callback);
+    }, function (callback) {
+      db.runSql('ALTER TABLE submission_files ADD COLUMN "createdAt" timestamp with time zone NOT NULL;', callback);
+    }, function (callback) {
+      db.runSql('ALTER TABLE submission_files ADD COLUMN "updatedAt" timestamp with time zone NOT NULL;', callback);
+    }
+  ], callback);
+};
+
+exports.down = function(db, callback) {
+  async.series([
+    function (callback) {
+      db.dropTable('challenge_files', callback);
+    }, function (callback) {
+      db.dropTable('submission_files', callback);
+    }
+  ], callback);
+};
diff --git a/config/schema-migrations/20141107002604-files-migrate.js b/config/schema-migrations/20141107002604-files-migrate.js
@@ -0,0 +1,37 @@
+var dbm = require('db-migrate');
+var async = require('async');
+var type = dbm.dataType;
+
+exports.up = function(db, callback) {
+  console.info('migrate!!!');
+  db.all('SELECT "column_name" ' +
+  'FROM "information_schema"."columns" ' +
+  'WHERE "table_name"=\'files\' and "column_name"=\'challengeId\';', function (err, results) {
+    if (err) {
+      return callback(err);
+    }
+    if (results && results.length) {
+      async.series([
+        function (callback) {
+          db.runSql('INSERT INTO challenge_files ("fileId", "challengeId", "createdAt", "updatedAt") ' +
+          'SELECT id, "challengeId", "createdAt", "updatedAt" ' +
+          'FROM files WHERE "challengeId" IS NOT NULL', callback);
+        }, function (callback) {
+          db.runSql('INSERT INTO submission_files ("fileId", "submissionId", "createdAt", "updatedAt") ' +
+          'SELECT id, "submissionId", "createdAt", "updatedAt" ' +
+          'FROM files WHERE "submissionId" IS NOT NULL', callback);
+        }, function (callback) {
+          db.runSql('ALTER TABLE files DROP COLUMN "submissionId"', callback);
+        }, function (callback) {
+          db.runSql('ALTER TABLE files DROP COLUMN "challengeId"', callback);
+        }
+      ], callback);
+    } else {
+      callback();
+    }
+  });
+};
+
+exports.down = function(db, callback) {
+  callback();
+};
diff --git a/lib/controllerHelper.js b/lib/controllerHelper.js
diff --git a/test/controllers/challenges.js b/test/controllers/challenges.js
diff --git a/test/controllers/files.js b/test/controllers/files.js
diff --git a/test/models/file.js b/test/models/file.js
diff --git a/test/swaggerTestHelper.js b/test/swaggerTestHelper.js
