Merge branch 'development' into 118-create-add-endpoint-for-accreditation

Author: Hitansh159

.github/workflows/test.yml

@@ -0,0 +1,33 @@
+name: Testing Services
+
+on:
+    pull_request:
+        branches:
+            - main
+            - development
+
+
+env: 
+  TOKEN_SECRET: ${{ secrets.TOKEN_SECRET }}
+  DB_URL: ${{ secrets.DB_URL }}
+
+permissions:
+    contents: read
+        
+jobs:
+  test:
+    name: Testing files
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+          cache: npm
+      - name: Installation
+        run: npm ci
+      - name: Running Tests 
+        run: npm run test

Contribution.md

@@ -0,0 +1,99 @@
+# Welcome to TCET Open Source contributing guide 
+
+Thank you for investing your time in contributing to our project!
+
+In this guide you will get an overview of the contribution workflow from opening an issue, creating a PR, and merging the PR.
+
+
+## New contributor guide
+
+To get an overview and installation of the project, read the [README](README.md). Here are some resources to help you get started with open source contributions:
+
+- [Finding ways to contribute to open source on GitHub](https://docs.github.com/en/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github)
+- [Set up Git](https://docs.github.com/en/get-started/quickstart/set-up-git)
+- [GitHub flow](https://docs.github.com/en/get-started/quickstart/github-flow)
+- [Collaborating with pull requests](https://docs.github.com/en/github/collaborating-with-pull-requests)
+
+
+## Getting started
+
+To navigate our codebase with confidence, see our [Github Repository](https://github.com/tcet-opensource/erp-backend)
+
+## Issues
+
+
+#### Asking to work on an issue
+
+Scan through our [existing issues](https://github.com/tcet-opensource/erp-backend/issues) to find one that interests you. You can narrow down the search using `labels` as filters. See [Labels](https://github.com/tcet-opensource/erp-backend/labels) for more information. For contributing comment on that specific issue that you want to work on it and we will assign that specific issue to you. Please remember only start working on the issue after it is assigned to you.
+
+#### Create a new issue
+
+If you find a bug or want to add any sort of feature in the repository , [search if an issue already exists](https://github.com/tcet-opensource/erp-backend/issues). If a related issue doesn't exist, you can open a new issue using a relevant [issue form](https://github.com/tcet-opensource/erp-backend/issues/new). Please note that the name of the issue title should be relevant and should give an idea about what you are working on.
+
+
+## Make Changes
+
+### Make changes in the UI
+
+Click **Make a contribution** at the bottom of erp-backend to make small changes such as a typo, sentence fix, or a broken link. This takes you to the `.md` file where you can make your changes and [create a pull request](#pull-request) for a review.
+
+
+### Make changes locally
+
+1. External Contributors , Fork the repository
+- Using GitHub Desktop:
+  - [Getting started with GitHub Desktop](https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop) will guide you through setting up Desktop.
+  - Once Desktop is set up, you can use it to fork the repo
+- Using the command line:
+  - [Fork the repo](https://github.com/tcet-opensource/erp-backend/fork), so that you can make your changes without affecting the original project until you're ready to merge them.
+- After forking clone the forked repository 
+- Switch from main branch to development branch in your cloned repository
+  - To switch to development write command `git remote add upstream <link of original repo>` and `git fetch upstream` in the terminal 
+- To install node modules use command `npm ci` 
+- Switch to Development Branch and create a working branch for each issue.
+- To create a branch use command `git branch <name of the branch>`
+  - NOTE: The name of the branch should in the format of -> Issue number-name of the issue (eg: 50-create_CRUD_for_infra_model)
+- Then from the development branch move to the branch created by using command `git checkout <branch name>`
+- All changes on the code should be done on your specific branch
+- Test your changes: After making your changes, it is crucial to thoroughly test them to ensure they function as intended and do not introduce any new bugs. Run any relevant tests or simulations and verify that the modified code performs correctly.
+- Before pushing the changes sync fork in the forked repo and pull the changes before pushing 
+- After pushing go to the forked repository and press contribute and make a pull request
+
+2. Internal Contributors, Clone the Repository 
+&nbsp;
+`git clone -b development https://github.com/tcet-opensource/erp-backend.git`
+- To install node modules use command `npm ci` 
+- Switch to Development Branch and create a working branch for each issue.
+- To create a branch use command `git branch <name of the branch>`
+  - NOTE: The name of the branch should in the format of -> Issue number-name of the issue (eg: 50-create_CRUD_for_infra_model)
+- Then from the development branch move to the branch created by using command `git checkout <branch name>`
+- All changes on the code should be done on your specific branch
+- Test your changes: After making your changes, it is crucial to thoroughly test them to ensure they function as intended and do not introduce any new bugs. Run any relevant tests or simulations and verify that the modified code performs correctly.
+
+
+### Commit your changes
+- Stage your changes: Use the git add command to stage the modified files for the commit. This marks the changes as ready to be included in the next commit. 
+`git add <file1> <file2> ...` or `git add .`
+- Commit your changes: Create a commit to record your modifications with a meaningful commit message. This helps in tracking and understanding the purpose of the changes.
+`git commit -m "relevant info of the change"`
+- Before pushing the changes on the repository always remember to pull the code to avoid any merge conflicts
+`git pull origin development`
+- try pushing the code on the development branch and not directly to the main branch
+
+### Push your Changes
+- After committing your changes, you push them to a remote repository (in this case, your forked repository on GitHub) using the git push command. Pushing your changes uploads them to the remote repository, making them visible to others and allowing you to share your work.
+ `git push origin <branch name>`
+
+
+### Pull Request
+
+When you're finished with the changes, create a pull request, also known as a PR.
+- Don't forget to link PR to issue by using "#" issue number , if you are solving one.
+- Once you submit your PR, a team member will review your proposal. We may ask questions or request additional information.
+- We may ask for changes to be made before a PR can be merged, either using suggested changes or pull request comments. You can apply suggested changes directly through the UI. You can make any other changes in your fork, then commit them to your branch.
+- As you update your PR and apply changes, mark each conversation as resolved
+- If you run into any merge issues, checkout this [git merge conflicts](https://github.com/skills/resolve-merge-conflicts) to help you resolve merge conflicts and other issues.
+
+### Your PR is merged!
+
+Congratulations , The TCET Open Source team thanks you.

Dockerfile

@@ -12,4 +12,3 @@ EXPOSE 3500
 CMD ["npm", "run", "start"]
 
 
-

app.js

@@ -9,6 +9,7 @@ import indexRouter from "#routes/index";
 import usersRouter from "#routes/users";
 import authRouter from "#routes/auth";
 import accreditationRouter from "#routes/accreditation";
+import infrastructureRouter from "#routes/infrastructure";
 
 const app = express();
 const currDirName = dirname(fileURLToPath(import.meta.url));
@@ -28,5 +29,6 @@ app.use("/", indexRouter);
 app.use("/users", usersRouter);
 app.use("/auth", authRouter);
 app.use("/accreditation", accreditationRouter);
+app.use("/infrastructure", infrastructureRouter);
 
 export default app;

controller/infrastructure.js

@@ -0,0 +1,18 @@
+import { createinfrastructure } from "#services/infrastructure";
+import { logger } from "#util";
+
+async function addinfrastructure(req, res) {
+  const {
+    name, type, wing, floor, capacity,
+  } = req.body;
+  try {
+    const newinfrastructure = await createinfrastructure(name, type, wing, floor, capacity);
+    res.json({ res: `added user ${newinfrastructure.id}` });
+  } catch (error) {
+    logger.error("Error while inserting", error);
+    res.status(500);
+    res.json({ err: "Error while inserting in DB" });
+  }
+}
+
+export default { addinfrastructure };

models/assignment.js

@@ -0,0 +1,10 @@
+import connector from '#models/databaseUtil';
+
+const assignmentSchema = {
+  no: { type: Number, required: true },
+  title: { type: String, required: true },
+  type: { type: String, required: true, enum: ['FA', 'RA'] },
+  marks: { type: Number, required: true },
+};
+
+const Assignment = connector.model('Assignment', assignmentSchema);

models/attendance.js

@@ -3,37 +3,63 @@ import connector from "./databaseUtil";
 connector.set("debug", true);
 
 const attendanceSchema = {
-  date: { type: Date, required: true },
-  time: { type: String, required: true },
-  absentees: { type: Array },
+  student: { type: connector.Schema.Types.ObjectId, ref: "Student", required: "true" },
+  course: { type: connector.Schema.Types.ObjectId, ref: "Course", required: "true" },
+  monthlyAttended: { type: Number, default: 0 },
+  monthlyOccured: { type: Number, default: 0 },
+  cumulativeAttended: { type: Number, default: 0 },
+  cumulativeOccured: { type: Number, default: 0 },
 };
 
 const Attendance = connector.model("Attendance", attendanceSchema);
 
-async function create(date, time, absentees) {
-  const attendance = new Attendance({
-    date,
-    time,
-    absentees,
-  });
-  const newAttendence = await attendance.save();
-  return newAttendence;
+async function create(studentId, courseId) {
+  try {
+    const attendance = new Attendance({
+      student: studentId,
+      course: courseId,
+    });
+    const createAttendance = await attendance.save();
+    return createAttendance;
+  } catch (error) {
+    console.error("Error creating attendance:", error);
+    return null;
+  }
 }
 
-async function remove(filter) {
-  const res = await Attendance.findOneAndDelete(filter);
-  return res;
+async function read(attendanceId) {
+  try {
+    const attendance = await Attendance.findById(attendanceId);
+    return attendance;
+  } catch (error) {
+    console.error("error reading attendance", error);
+    return null;
+  }
 }
 
-async function grantAttendance(roll, date) {
-  const res = await Attendance.findOneAndUpdate(
-    date,
-    { $pull: { absentees: roll } },
-    { new: true },
-  );
-  return res;
+async function update(attendanceId, updateData) {
+  try {
+    const updatedAttendance = await Attendance.findByIdAndUpdate(
+      attendanceId,
+      updateData,
+      { new: true },
+    );
+    return updatedAttendance;
+  } catch (error) {
+    console.error("error updating attendance:", error);
+    return null;
+  }
 }
 
+async function remove(attendanceId) {
+  try {
+    const deletedAttendance = await Attendance.findByIdAndDelete(attendanceId);
+    return deletedAttendance;
+  } catch (error) {
+    console.error("error removing attendance", error);
+    return null;
+  }
+}
 export default {
-  create, remove, grantAttendance,
+  create, remove, update, read,
 };

models/course.js

@@ -0,0 +1,88 @@
+const { connector } = require('#models/databaseUtil')
+
+const courseSchema = {
+  name: { type: String, required: true },
+  code: { type: String, required: true },
+  theoryHours: { type: Number, required: true },
+  tutorialHours: { type: Number, required: true },
+  practicalHours: { type: Number, required: true },
+  totalCredit: { type: Number, required: true },
+  ISAMarks: { type: Number, required: true },
+  ESEMarks: { type: Number, required: true },
+  tutorialMarks: { type: Number, required: true },
+  practicalMarks: { type: Number, required: true },
+  semester: {
+    type: connector.Schema.Types.ObjectId,
+    ref: 'Semester',
+    required: true,
+  },
+  subType: {
+    type: String,
+    enum: ['open', 'professional', 'core'],
+    required: true,
+  }, // can be open, professional, or core
+  prerequisites: { type: [String], required: true }, // array of strings
+  objective: { type: String, required: true },
+  outcomes: [
+    {
+      outcome: { type: String },
+      RBTLevel: { type: [String] },
+    },
+  ], // this is the modules from syllabus
+  modules: [{ type: connector.Schema.Types.ObjectId, ref: 'Module' }],
+  practicals: [{ type: connector.Schema.Types.ObjectId, ref: 'Practical' }],
+  tutorials: [{ type: connector.Schema.Types.ObjectId, ref: 'Tutorial' }],
+  assignments: [{ type: connector.Schema.Types.ObjectId, ref: 'Assignment' }],
+  reccTextbooks: { type: [String], required: true },
+  refBooks: { type: [String], required: true },
+  evalScheme: { type: [Number], required: true },
+}
+
+// virtual for total hours
+courseSchema.virtual('totalHours').get(function() {
+  return this.theoryHours + this.tutorialHours + this.practicalHours
+})
+
+// virtual for theory marks
+courseSchema.virtual('theoryMarks').get(function() {
+  return this.ISAMarks + this.ESEMarks
+})
+
+// virtual for total marks
+courseSchema.virtual('totalMarks').get(function() {
+  return this.theoryMarks + this.tutorialMarks + this.practicalMarks
+})
+
+const Course = connector.model('Course', courseSchema)
+
+/// CRUD operations ///
+
+async function create(courseData) {
+  const course = new Course(courseData)
+  const createdCourse = await course.save()
+  return createdCourse
+}
+
+async function read(filter, limit = 1) {
+  const courseData = await Course.find(filter).limit(limit)
+  return courseData
+}
+
+async function update(filter, updateObject) {
+  const updatedCourse = await Course.findOneAndUpdate(filter, updateObject, {
+    new: true,
+  }).exec()
+  return updatedCourse
+}
+
+async function remove(filter) {
+  const deletedCourse = await Course.findOneAndDelete(filter).exec()
+  return deletedCourse
+}
+
+export default {
+  create,
+  read,
+  update,
+  remove,
+}

models/department.js

@@ -0,0 +1,19 @@
+import connector from '#models/databaseUtil';
+
+const departmentSchema = {
+  name: { type: Number, required: true },
+  acronym: { type: String, required: true, immutable: true },
+  yearOfStarting: { type: Date, immutable: true, required: true },
+  accreditations: [{
+    type: connector.Schema.Types.ObjectId,
+    ref: 'Accreditation',
+    required: true,
+  }],
+  infrastructures: [{
+    type: connector.Schema.Types.ObjectId,
+    ref: 'Infrastructure',
+    required: true,
+  }],
+};
+
+const Department = connector.model('Department', departmentSchema);