fixed eslint + fixed merge conflict

209 model for activity

Author: TejasNair9977

models/activity.js

@@ -0,0 +1,24 @@
+import connector from "#models/databaseUtil";
+
+const activitySchema = {
+  activityBlueprint: { type: connector.Schema.Types.ObjectId, ref: "ActivityBlueprint", required: true },
+  startTime: { type: Date, required: true },
+  duration: { type: Number, required: true },
+  course: { type: connector.Schema.Types.ObjectId, ref: "Course", required: true },
+  faculty: { type: connector.Schema.Types.ObjectId, ref: "Faculty", required: true },
+  type: {
+    type: String,
+    required: true,
+    enum: ["LECTURE", "PRACTICAL", "TUTORIAL"],
+  },
+  task: [{
+    type: connector.Schema.Types.ObjectId,
+    ref: ["Topic", "Practical", "Tutorial"],
+    required: true,
+  }],
+  group: { type: connector.Schema.Types.ObjectId, ref: "Group", required: true },
+  students: [{ type: connector.Schema.Types.ObjectId, ref: "Student", required: true }],
+};
+
+// eslint-disable-next-line  no-unused-vars
+const Activity = connector.model("Activity", activitySchema);

models/activityBlueprint.js

@@ -1,20 +1,19 @@
-import connector from "#models/databaseUtil"
+import connector from "#models/databaseUtil";
 
 const activityBluePrintSchema = {
-    number : { type: Number, required: true },
-    academicYearYear: {
-        type: String,
-        required: true,
-        validate: {
-          validator: function(value) {
-            return /^2\d{3}$/.test(value); // Matches "2" followed by any 3 digits
-          },
-          message: props => `${props.value} is not a valid year format starting with "2"!`
-        }
-      },
-      type : { enum : ['ODD', 'EVEN'] , required : true},
-    startDate: {type : Date, required : true},
-    endDate : {type : Date, required : true}
-}
+  number: { type: Number, required: true },
+  academicYearYear: {
+    type: String,
+    required: true,
+    validate: {
+      validator: (value) => /^2\d{3}$/.test(value),
+      message: (props) => `${props.value} is not a valid year format starting with "2"!`,
+    },
+  },
+  type: { enum: ["ODD", "EVEN"], required: true },
+  startDate: { type: Date, required: true },
+  endDate: { type: Date, required: true },
+};
 
-const ActivityBlueprint = connector.model("ActivityBlueprint", activityBluePrintSchema);
+// eslint-disable-next-line  no-unused-vars
+const ActivityBlueprint = connector.model("ActivityBlueprint", activityBluePrintSchema);

models/assignment.js

@@ -23,7 +23,7 @@ async function read(filter, limit = 1) {
   return assignmentDoc;
 }
 
-async function update(filter, updateObject, options = {multi: true}) {
+async function update(filter, updateObject, options = { multi: true }) {
   const updateResult = await Assignment.updateMany(filter, { $set: updateObject }, options);
   return updateResult.acknowledged;
 }
@@ -39,4 +39,3 @@ export default {
   update,
   remove,
 };
-

models/coursework.js

@@ -1,14 +1,14 @@
 import connector from "#models/databaseUtil";
 
 const courseworkSchema = {
-    student: { type: mongoose.Schema.Types.ObjectId, ref: 'Student', required: true},
-    type:{type : String , enum : ['onCampus','offCampus'], required: true},
-    course:{type:mongoose.Schema.Types.ObjectId, ref: 'Course', required:true},
-    task: {type: mongoose.Schema.Types.ObjectId, refPath: 'objectID', required: true },
-        objectID: {type: String, enum: ['Practical', 'Tutorial', 'Assignment'], required: true},
-    activity:{type:mongoose.Schema.Types.ObjectId, ref: 'Activity',required:true},
-    marks: {type: Number, required: true},
+  student: { type: connector.Schema.Types.ObjectId, ref: "Student", required: true },
+  type: { type: String, enum: ["onCampus", "offCampus"], required: true },
+  course: { type: connector.Schema.Types.ObjectId, ref: "Course", required: true },
+  task: { type: connector.Schema.Types.ObjectId, refPath: "objectID", required: true },
+  objectID: { type: String, enum: ["Practical", "Tutorial", "Assignment"], required: true },
+  activity: { type: connector.Schema.Types.ObjectId, ref: "Activity", required: true },
+  marks: { type: Number, required: true },
 };
-const Coursework = connector.model('Coursework', courseworkSchema);
 
-module.exports = Coursework;
+// eslint-disable-next-line  no-unused-vars
+const Coursework = connector.model("Coursework", courseworkSchema);

models/exam.js

@@ -37,4 +37,4 @@ export default {
   read,
   update,
   remove,
-};
+};

models/paper.js

@@ -8,4 +8,5 @@ const paperSchema = {
   mark: { type: Number, required: true },
 };
 
+// eslint-disable-next-line  no-unused-vars
 const Paper = connector.model("Paper", paperSchema);

models/practical.js

@@ -15,7 +15,7 @@ const practicalSchema = {
 // eslint-disable-next-line  no-unused-vars
 const Practical = connector.model("Practical", practicalSchema);
 
-//CRUD operations
+//  CRUD operations
 async function remove(filter) {
   const deleteResult = await Practical.deleteMany(filter);
   return deleteResult.acknowledged;
@@ -48,4 +48,4 @@ async function update(filter, updateObject, options = { multi: true }) {
 
 export default {
   create, read, update, remove,
-};
+};

models/topic.js

@@ -4,13 +4,13 @@ const topicSchema = {
   title: { type: String, required: true },
 };
 // eslint-disable-next-line  no-unused-vars
-const Topic = connector.model("topic", topicSchema);
+const Topic = connector.model("Topic", topicSchema);
 
-//CURD operations
+//  CURD operations
 async function create(topicData) {
-  const{
-    title
-  }=topicData;
+  const {
+    title,
+  } = topicData;
   const topic = new Topic({
     title,
   });

models/tutorial.js

@@ -48,4 +48,3 @@ export default {
   update,
   remove,
 };
-

test/routes/accreditation.test.js

@@ -1,25 +1,25 @@
-import request from 'supertest';
-import { jest } from '@jest/globals'; // eslint-disable-line import/no-extraneous-dependencies
-import app from '#app';
-import accreditationModel from '#models/accreditation';
-import connector from '#models/databaseUtil';
+import request from "supertest";
+import { jest } from "@jest/globals"; // eslint-disable-line import/no-extraneous-dependencies
+import app from "#app";
+import accreditationModel from "#models/accreditation";
+import connector from "#models/databaseUtil";
 
-jest.mock('#util');
+jest.mock("#util");
 
 let server;
 let agent;
 beforeAll((done) => {
   server = app.listen(5000, () => {
     agent = request.agent(server);
-    connector.set('debug', false);
+    connector.set("debug", false);
     done();
   });
 });
 
 function cleanUp(callback) {
-  accreditationModel.remove({ name: 'xyz' }).then(() => {
+  accreditationModel.remove({ name: "xyz" }).then(() => {
     connector.disconnect((DBerr) => {
-      if (DBerr) console.log('Database dissconnnect error: ', DBerr);
+      if (DBerr) console.log("Database dissconnnect error: ", DBerr);
       server.close((serverErr) => {
         if (serverErr) console.log(serverErr);
         callback();
@@ -32,44 +32,44 @@ afterAll((done) => {
   cleanUp(done);
 });
 
-describe('checking accreditation functions', () => {
-  it('create accreditation', async () => {
-    const response = await agent.post('/accreditation/add').send({
-      name: 'xyz',
-      agencyName: 'abc',
-      dateofAccreditation: '2023-06-18T14:11:30Z',
-      dateofExpiry: '2023-05-28T14:10:30Z',
+describe("checking accreditation functions", () => {
+  it("create accreditation", async () => {
+    const response = await agent.post("/accreditation/add").send({
+      name: "xyz",
+      agencyName: "abc",
+      dateofAccreditation: "2023-06-18T14:11:30Z",
+      dateofExpiry: "2023-05-28T14:10:30Z",
     });
-    expect(response.headers['content-type']).toMatch(/json/);
+    expect(response.headers["content-type"]).toMatch(/json/);
     expect(response.status).toBe(200);
     expect(response.body.res).toMatch(/added accreditation/);
   });
 
   beforeEach(async () => {
-    agent.post('/accreditation/add').send({
-      name: 'xyz',
-      agencyName: 'abc',
-      dateofAccreditation: '2023-06-18T14:11:30Z',
-      dateofExpiry: '2023-05-28T14:10:30Z',
+    agent.post("/accreditation/add").send({
+      name: "xyz",
+      agencyName: "abc",
+      dateofAccreditation: "2023-06-18T14:11:30Z",
+      dateofExpiry: "2023-05-28T14:10:30Z",
     });
   });
 
   afterEach(async () => {
-    await accreditationModel.remove({ name: 'xyz' });
+    await accreditationModel.remove({ name: "xyz" });
   });
 
-  it('read accreditation', async () => {
+  it("read accreditation", async () => {
     const response = await agent
-      .post('/accreditation/list')
-      .send({ name: 'xyz' });
+      .post("/accreditation/list")
+      .send({ name: "xyz" });
     expect(response.body.res).not.toBeNull();
   });
 
-  it('update accreditation', async () => {
+  it("update accreditation", async () => {
     const response = await agent
-      .post('/accreditation/update')
-      .send({ name: 'xyz' }, { name: '123' });
-    expect(response.headers['content-type']).toMatch(/json/);
+      .post("/accreditation/update")
+      .send({ name: "xyz" }, { name: "123" });
+    expect(response.headers["content-type"]).toMatch(/json/);
     expect(response.status).toBe(200);
     expect(response.body.res).toMatch(/accreditation updated/);
   });