From feb33faeb9955d1e876da03f8218e61eb85122ac Mon Sep 17 00:00:00 2001 From: Bastien Seree Date: Thu, 26 Sep 2024 15:19:35 +0200 Subject: [PATCH] Cyberleague: Rename module in CLModule to avoid problems with klesia --- backend/web/server/models/CLModules.js | 16 ++++++++++++++++ .../{ModuleSchema.js => CLModuleSchema.js} | 4 ++-- .../plugins/cyberleague/schemas/ProgramSchema.js | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 backend/web/server/models/CLModules.js rename backend/web/server/plugins/cyberleague/schemas/{ModuleSchema.js => CLModuleSchema.js} (88%) diff --git a/backend/web/server/models/CLModules.js b/backend/web/server/models/CLModules.js new file mode 100644 index 0000000000..246a3e3bd8 --- /dev/null +++ b/backend/web/server/models/CLModules.js @@ -0,0 +1,16 @@ +const mongoose = require('mongoose') +const {getDataModel} = require('../../config/config') + +let CLModuleSchema=null + +try { + CLModuleSchema=require(`../plugins/${getDataModel()}/schemas/CLModuleSchema`) + CLModuleSchema.plugin(require('mongoose-lean-virtuals')) +} +catch(err) { + if (err.code !== 'MODULE_NOT_FOUND') { + throw err + } +} + +module.exports = CLModuleSchema ? mongoose.model('clModule', CLModuleSchema) : null diff --git a/backend/web/server/plugins/cyberleague/schemas/ModuleSchema.js b/backend/web/server/plugins/cyberleague/schemas/CLModuleSchema.js similarity index 88% rename from backend/web/server/plugins/cyberleague/schemas/ModuleSchema.js rename to backend/web/server/plugins/cyberleague/schemas/CLModuleSchema.js index 3e63040972..0a766dd00e 100644 --- a/backend/web/server/plugins/cyberleague/schemas/ModuleSchema.js +++ b/backend/web/server/plugins/cyberleague/schemas/CLModuleSchema.js @@ -3,7 +3,7 @@ const {schemaOptions} = require('../../../utils/schemas') const Schema = mongoose.Schema -const ModuleSchema = new Schema({ +const CLModuleSchema = new Schema({ resources: { type: [{ type: Schema.Types.ObjectID, @@ -26,4 +26,4 @@ const ModuleSchema = new Schema({ /* eslint-disable prefer-arrow-callback */ /* eslint-enable prefer-arrow-callback */ -module.exports = ModuleSchema +module.exports = CLModuleSchema diff --git a/backend/web/server/plugins/cyberleague/schemas/ProgramSchema.js b/backend/web/server/plugins/cyberleague/schemas/ProgramSchema.js index 1940b4f71c..113dbcbe57 100644 --- a/backend/web/server/plugins/cyberleague/schemas/ProgramSchema.js +++ b/backend/web/server/plugins/cyberleague/schemas/ProgramSchema.js @@ -6,7 +6,7 @@ const Schema = mongoose.Schema const ProgramSchema = new Schema({ modules: { type: Schema.Types.ObjectId, - ref: 'module', + ref: 'cLModule', required: [true, 'Les modules sont obligatoires'], }, name: {