From 9e1eee8ffaeb3f2ba94403120db8e1b6e9d26880 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Wed, 14 Jun 2023 12:34:37 +0530 Subject: [PATCH 1/6] CRUD operation added for module --- models/module.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 models/module.js diff --git a/models/module.js b/models/module.js new file mode 100644 index 0000000..33a485d --- /dev/null +++ b/models/module.js @@ -0,0 +1,57 @@ +import connector from '#models/databaseUtil'; +import { logger } from '#util'; + +connector.set('debug', true); +const moduleSchema = { + modNo: { type: Number, required: true }, + moduleName: { type: String, required: true }, + moduleOutcome: { type: String, required: true }, + moduleContents: [{ type: String, required: true }], + hrsPerModule: { type: Number, required: true }, + cognitiveLevels: [{ type: String, required: true }], +}; + +const moduleModel = new connector.model('Module', moduleSchema); + +async function remove(filter) { + const res = await moduleModel.findOneAndDelete(filter); + return res; +} + +async function create( + modNo, + moduleName, + moduleOutcome, + moduleContents, + hrsPerModule, + cognitiveLevels +) { + const module = new moduleModel({ + modNo, + moduleName, + moduleOutcome, + moduleContents, + hrsPerModule, + cognitiveLevels, + }); + const moduleDoc = await module.save(); + return moduleDoc; +} + +async function read(filter, limit = 1) { + const moduleData = await moduleModel.find(filter).limit(limit); + return moduleData; +} + +async function update(filter, updateObject) { + const module = await moduleModel.findOneAndUpdate(filter, updateObject, { + new: true, + }); + return module; +} +export default { + create, + read, + update, + remove, +}; From 5327a0a19a4d92df2becc5ae08888f489d6d4cf9 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Fri, 16 Jun 2023 16:19:31 +0530 Subject: [PATCH 2/6] j --- models/module.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/models/module.js b/models/module.js index 33a485d..ba768ec 100644 --- a/models/module.js +++ b/models/module.js @@ -49,6 +49,13 @@ async function update(filter, updateObject) { }); return module; } + +async function test() { + await create(1, 'Maths', 'abc', 'xyz', 5, 'abc'); + const reading = await read({}); + console.log(reading); +} + export default { create, read, From 0c52260a05e734aea94e5f7c4f54c83e8ab77aaf Mon Sep 17 00:00:00 2001 From: Dhruv Date: Fri, 16 Jun 2023 17:14:59 +0530 Subject: [PATCH 3/6] Made eslint changes --- models/module.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/models/module.js b/models/module.js index ba768ec..fe60e26 100644 --- a/models/module.js +++ b/models/module.js @@ -1,7 +1,6 @@ -import connector from '#models/databaseUtil'; -import { logger } from '#util'; +import connector from "#models/databaseUtil"; -connector.set('debug', true); +connector.set("debug", true); const moduleSchema = { modNo: { type: Number, required: true }, moduleName: { type: String, required: true }, @@ -11,7 +10,7 @@ const moduleSchema = { cognitiveLevels: [{ type: String, required: true }], }; -const moduleModel = new connector.model('Module', moduleSchema); +const moduleModel = new connector.model("Module", moduleSchema); async function remove(filter) { const res = await moduleModel.findOneAndDelete(filter); @@ -24,7 +23,7 @@ async function create( moduleOutcome, moduleContents, hrsPerModule, - cognitiveLevels + cognitiveLevels, ) { const module = new moduleModel({ modNo, @@ -51,11 +50,13 @@ async function update(filter, updateObject) { } async function test() { - await create(1, 'Maths', 'abc', 'xyz', 5, 'abc'); + await create(1, "Maths", "abc", "xyz", 5, "abc"); const reading = await read({}); console.log(reading); } +test(); + export default { create, read, From 16b40b13a1fa41e4a9325d39a9f078942a52856d Mon Sep 17 00:00:00 2001 From: Dhruv Date: Sat, 17 Jun 2023 18:25:49 +0530 Subject: [PATCH 4/6] pull development --- models/module.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/models/module.js b/models/module.js index fe60e26..b5f892c 100644 --- a/models/module.js +++ b/models/module.js @@ -1,6 +1,6 @@ -import connector from "#models/databaseUtil"; +import connector from '#models/databaseUtil'; -connector.set("debug", true); +connector.set('debug', true); const moduleSchema = { modNo: { type: Number, required: true }, moduleName: { type: String, required: true }, @@ -10,7 +10,7 @@ const moduleSchema = { cognitiveLevels: [{ type: String, required: true }], }; -const moduleModel = new connector.model("Module", moduleSchema); +const moduleModel = new connector.model('Module', moduleSchema); async function remove(filter) { const res = await moduleModel.findOneAndDelete(filter); @@ -23,7 +23,7 @@ async function create( moduleOutcome, moduleContents, hrsPerModule, - cognitiveLevels, + cognitiveLevels ) { const module = new moduleModel({ modNo, @@ -50,7 +50,7 @@ async function update(filter, updateObject) { } async function test() { - await create(1, "Maths", "abc", "xyz", 5, "abc"); + await create(1, 'Maths', 'abc', 'xyz', 5, 'abc'); const reading = await read({}); console.log(reading); } From c9de98b30284b262a9cbc2acf24d7647f4ca8429 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Sat, 17 Jun 2023 18:33:27 +0530 Subject: [PATCH 5/6] changes are pull from development and conflict resolve --- models/module.js | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/models/module.js b/models/module.js index b5f892c..1ec2c18 100644 --- a/models/module.js +++ b/models/module.js @@ -1,8 +1,8 @@ -import connector from '#models/databaseUtil'; +import connector from "#models/databaseUtil"; -connector.set('debug', true); +connector.set("debug", true); const moduleSchema = { - modNo: { type: Number, required: true }, + moduleNo: { type: Number, required: true }, moduleName: { type: String, required: true }, moduleOutcome: { type: String, required: true }, moduleContents: [{ type: String, required: true }], @@ -10,7 +10,7 @@ const moduleSchema = { cognitiveLevels: [{ type: String, required: true }], }; -const moduleModel = new connector.model('Module', moduleSchema); +const moduleModel = new connector.model("Module", moduleSchema); async function remove(filter) { const res = await moduleModel.findOneAndDelete(filter); @@ -18,15 +18,15 @@ async function remove(filter) { } async function create( - modNo, + moduleNo, moduleName, moduleOutcome, moduleContents, hrsPerModule, - cognitiveLevels + cognitiveLevels, ) { const module = new moduleModel({ - modNo, + moduleNo, moduleName, moduleOutcome, moduleContents, @@ -49,14 +49,6 @@ async function update(filter, updateObject) { return module; } -async function test() { - await create(1, 'Maths', 'abc', 'xyz', 5, 'abc'); - const reading = await read({}); - console.log(reading); -} - -test(); - export default { create, read, From c08fdfdbe8037dde3f8018d944ea244444cd31fc Mon Sep 17 00:00:00 2001 From: Dhruv Date: Mon, 19 Jun 2023 08:00:17 +0530 Subject: [PATCH 6/6] remove connector.set(debug, true) and change moduleModel to Module --- models/module.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/models/module.js b/models/module.js index 1ec2c18..3387f38 100644 --- a/models/module.js +++ b/models/module.js @@ -1,6 +1,5 @@ -import connector from "#models/databaseUtil"; +import connector from '#models/databaseUtil'; -connector.set("debug", true); const moduleSchema = { moduleNo: { type: Number, required: true }, moduleName: { type: String, required: true }, @@ -10,10 +9,10 @@ const moduleSchema = { cognitiveLevels: [{ type: String, required: true }], }; -const moduleModel = new connector.model("Module", moduleSchema); +const Module = new connector.model('Module', moduleSchema); async function remove(filter) { - const res = await moduleModel.findOneAndDelete(filter); + const res = await Module.findOneAndDelete(filter); return res; } @@ -23,9 +22,9 @@ async function create( moduleOutcome, moduleContents, hrsPerModule, - cognitiveLevels, + cognitiveLevels ) { - const module = new moduleModel({ + const module = new Module({ moduleNo, moduleName, moduleOutcome, @@ -38,12 +37,12 @@ async function create( } async function read(filter, limit = 1) { - const moduleData = await moduleModel.find(filter).limit(limit); + const moduleData = await Module.find(filter).limit(limit); return moduleData; } async function update(filter, updateObject) { - const module = await moduleModel.findOneAndUpdate(filter, updateObject, { + const module = await Module.findOneAndUpdate(filter, updateObject, { new: true, }); return module;