From c897d3ecde811b94ee3c0eb74e8d6ffc86d723a9 Mon Sep 17 00:00:00 2001 From: Ankit <115006624+ANKIT638-ux@users.noreply.github.com> Date: Wed, 14 Jun 2023 10:34:32 +0530 Subject: [PATCH 1/7] changes --- models/infra-schema.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 models/infra-schema.js diff --git a/models/infra-schema.js b/models/infra-schema.js new file mode 100644 index 0000000..8b559af --- /dev/null +++ b/models/infra-schema.js @@ -0,0 +1,16 @@ +const subjectContent = new connector.model("subject content", subjectContentSchema); +module.exports = {}; + +const { connector } = require("./databaseUtil"); + +const infrastructureSchema = { + infraID: {type: Number, required: true}, + infraName: {type: String, required: true}, + infraType: {type: String, required: true}, + infraWing: {type: String, required: true}, + floor: {type: Number, required: true}, + capacity: {type:Number, required: true} +}; + +const infrastructureModel = new connector.model("Infrastructure", infrastructureSchema);; +module.exports = {}; \ No newline at end of file From f06cfacad92dee95cb555c7ef69b6e3710b433ed Mon Sep 17 00:00:00 2001 From: ANKIT638-ux <115006624+ANKIT638-ux@users.noreply.github.com> Date: Wed, 14 Jun 2023 10:51:37 +0530 Subject: [PATCH 2/7] Rename infra-schema.js to infra.js --- models/{infra-schema.js => infra.js} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename models/{infra-schema.js => infra.js} (96%) diff --git a/models/infra-schema.js b/models/infra.js similarity index 96% rename from models/infra-schema.js rename to models/infra.js index 8b559af..a08ca30 100644 --- a/models/infra-schema.js +++ b/models/infra.js @@ -13,4 +13,4 @@ const infrastructureSchema = { }; const infrastructureModel = new connector.model("Infrastructure", infrastructureSchema);; -module.exports = {}; \ No newline at end of file +module.exports = {}; From a0441b83e2f0e64b1703660f0b3d24fac5242aa0 Mon Sep 17 00:00:00 2001 From: ANKIT638-ux <115006624+ANKIT638-ux@users.noreply.github.com> Date: Wed, 14 Jun 2023 11:04:08 +0530 Subject: [PATCH 3/7] Update infra.js --- models/infra.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/models/infra.js b/models/infra.js index a08ca30..56c61a8 100644 --- a/models/infra.js +++ b/models/infra.js @@ -1,6 +1,3 @@ -const subjectContent = new connector.model("subject content", subjectContentSchema); -module.exports = {}; - const { connector } = require("./databaseUtil"); const infrastructureSchema = { From d4ed087a03e6260db7c5694be855abeae53777ef Mon Sep 17 00:00:00 2001 From: Ankit <115006624+ANKIT638-ux@users.noreply.github.com> Date: Thu, 15 Jun 2023 15:18:27 +0530 Subject: [PATCH 4/7] 35 create infra model1 --- models/infra.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/models/infra.js b/models/infra.js index 56c61a8..a95a540 100644 --- a/models/infra.js +++ b/models/infra.js @@ -1,4 +1,4 @@ -const { connector } = require("./databaseUtil"); +const { connector } = require("#models/databaseUtil"); const infrastructureSchema = { infraID: {type: Number, required: true}, @@ -9,5 +9,4 @@ const infrastructureSchema = { capacity: {type:Number, required: true} }; -const infrastructureModel = new connector.model("Infrastructure", infrastructureSchema);; -module.exports = {}; +const infrastructureModel = new connector.model("Infrastructure", infrastructureSchema); From 015e866ffe5a5498055e4be897e238cf3d7c709b Mon Sep 17 00:00:00 2001 From: Ankit <115006624+ANKIT638-ux@users.noreply.github.com> Date: Fri, 16 Jun 2023 13:32:35 +0530 Subject: [PATCH 5/7] Convert to import --- models/infra.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/infra.js b/models/infra.js index a95a540..50f1703 100644 --- a/models/infra.js +++ b/models/infra.js @@ -1,4 +1,4 @@ -const { connector } = require("#models/databaseUtil"); +import connector from "#models/databaseUtil"; const infrastructureSchema = { infraID: {type: Number, required: true}, From e66441f8ecf6875400f61b8225038afa5c929e65 Mon Sep 17 00:00:00 2001 From: Ankit <115006624+ANKIT638-ux@users.noreply.github.com> Date: Fri, 16 Jun 2023 13:36:32 +0530 Subject: [PATCH 6/7] change to import from require --- models/infra.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/infra.js b/models/infra.js index 50f1703..ceac10b 100644 --- a/models/infra.js +++ b/models/infra.js @@ -1,4 +1,4 @@ -import connector from "#models/databaseUtil"; +import connector from "#models/databaseUtil"; const infrastructureSchema = { infraID: {type: Number, required: true}, From 1673851704642434074084a3a210afac8612484e Mon Sep 17 00:00:00 2001 From: Ankit <115006624+ANKIT638-ux@users.noreply.github.com> Date: Fri, 16 Jun 2023 17:24:17 +0530 Subject: [PATCH 7/7] after eslint check --- models/infra.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/models/infra.js b/models/infra.js index ceac10b..6216202 100644 --- a/models/infra.js +++ b/models/infra.js @@ -1,12 +1,12 @@ import connector from "#models/databaseUtil"; const infrastructureSchema = { - infraID: {type: Number, required: true}, - infraName: {type: String, required: true}, - infraType: {type: String, required: true}, - infraWing: {type: String, required: true}, - floor: {type: Number, required: true}, - capacity: {type:Number, required: true} + infraID: { type: Number, required: true }, + infraName: { type: String, required: true }, + infraType: { type: String, required: true }, + infraWing: { type: String, required: true }, + floor: { type: Number, required: true }, + capacity: { type: Number, required: true }, }; const infrastructureModel = new connector.model("Infrastructure", infrastructureSchema);