Biweekly Merge #265

TejasNair9977 · 2023-08-27T06:17:25Z

Description

Merging all the teams changes to main, when there are no other PRs to worry about.

Checklist

Code follows project's style guidelines.
Changes are documented appropriately.

…backend into 119-create-get-endpoint-for-accreditation

Made changes in the virtual attribute as requested.

…y-model 112 refactor curd faculty model

…stent 162 make all model consistent

…_model_ 137_feat: Create Topic model and schema with key-value pairs

…on to controller

[Added] API documentation for all auth routes

…tion to controller and services.

…kend into 68-Create_CURD_Operation_forDepartment

[Added] update apidoc with index routes -177

…backend into 212-model-for-coursework

…backend into 213_Create_model_paper

…nt-model [Feature] Added CRUD in Assignment Model

…file 197 - FIXED ESLINT , now its runs only on staged files

…-fails fix[login]: 199-Update-error-message-for-non-existent-user

212 model for coursework

#218 curd to exam model

…itation_endpoints Added Testcases for all endpoints of accreditation

213 Create paper model

[Update] As per requirement

[Feature] Added CRUD in Tutorial Model #217

added curd operations to topic model

…ical [Feat]Added CURD to practical.js

209 model for activity

…infrastructure_endpointnewbranch 127 write testcases for infrastructure endpointnewbranch

Aastha-S-Rai

Looks good !!

kskarthik5

lgtm

eslint fixes

swathiharish-gh and others added 30 commits June 30, 2023 23:58

Refactored and Added CURD Operations in to the faculty model

4080221

#119 edited in accreditation file for get endpoint

4b8e75e

#119 Changes in a function parameter in services/accreditation.js

967720a

Merge branch 'development' of https://github.com/tcet-opensource/erp-…

b6111e9

…backend into 119-create-get-endpoint-for-accreditation

Update faculty.js

4612fd1

Made changes in the virtual attribute as requested.

preferred subjects converted to array

6d7b9ba

Merge pull request #155 from swathiharish-gh/112-refactor-curd-facult…

0328b42

…y-model 112 refactor curd faculty model

changed update to updateMany and delete to deleteMany

211d8cf

eslint fixed

4ed40bb

accreditations converted to array

d97cfaf

Merge pull request #164 from tcet-opensource/162-make_all_model_consi…

32e3dac

…stent 162 make all model consistent

Merged with development

f375331

Created get endpoint for accreditation

967b67f

137_feat: Create Topic model and schema with key-value pairs

1b6b1a3

Merge pull request #179 from Vikrantsingh22/_137_issue_create_a_topic…

a6ed529

…_model_ 137_feat: Create Topic model and schema with key-value pairs

[Added] API documentation for all auth routes

751a20d

added a route for delete in accredation and added function for deleti…

1657c2f

…on to controller

Merge pull request #180 from sumitst05/178-apidoc-for-auth-route

93577f9

[Added] API documentation for all auth routes

[Added] update apidoc with index routes

7859cbe

added a route for delete in accreditation and added function for dele…

af57f16

…tion to controller and services.

make_api_doc_in_apidoc.js_for_create_request_infrastructure/add

b1c43ff

[Added] infrastructre delete route and apidoc for it

455a656

[created]created get endpoint for infrastructure.js

5fa72ad

Merge branch 'development' of https://github.com/skyline-r34v/erp-bac…

3359bd2

…kend into 68-Create_CURD_Operation_forDepartment

Reverted package-lock.json and package.json

d2b061f

Merge branch 'development' into 177-UpdateApiDocs

341d707

Merge pull request #182 from sanika-wani/177-UpdateApiDocs

2d7fe1c

[Added] update apidoc with index routes -177

updated module

ce0beeb

updated

2baed66

[Create] Create a apidoc for Get Infrastructure

f634d96

asthasingh182004 and others added 23 commits August 25, 2023 15:52

#218-curd-to-exam-model

c870c8a

[Fixed] error of adding extra files in commit

9b88702

[Fixed] not exit error

a0f55dd

[ADDED]coursework.js file with model for coursework

66f218c

Merge branch 'development' of https://github.com/tcet-opensource/erp-…

e87f8d5

…backend into 212-model-for-coursework

Added Testcases for all endpoints of accreditation

b377fc9

Merge branch 'development' of https://github.com/tcet-opensource/erp-…

351a95a

…backend into 213_Create_model_paper

removed mongooose-long from package.json

46306ce

Merge pull request #217 from tcet-opensource/204-add-crud-to-assignme…

943ca6d

…nt-model [Feature] Added CRUD in Assignment Model

Merge pull request #237 from tcet-opensource/197-eslint-runs-for-all-…

db4d311

…file 197 - FIXED ESLINT , now its runs only on staged files

Merge pull request #225 from Vikrantsingh22/199-incorrect-error-login…

c247d60

…-fails fix[login]: 199-Update-error-message-for-non-existent-user

Merge pull request #244 from tcet-opensource/212-model-for-coursework

0e4de05

212 model for coursework

Merge pull request #243 from tcet-opensource/#218-curd-to-exam-model

a707f48

#218 curd to exam model

Merge pull request #245 from tcet-opensource/128-Testcases_for_Accred…

7884984

…itation_endpoints Added Testcases for all endpoints of accreditation

Merge pull request #223 from tcet-opensource/213_Create_model_paper

036be69

213 Create paper model

Merge pull request #239 from tcet-opensource/208-activityblue

b1069ac

[Update] As per requirement

Merge pull request #233 from Aryanzs/development

2c6d7f8

[Feature] Added CRUD in Tutorial Model #217

Merge pull request #229 from tcet-opensource/206-add-curd-to-topic-model

663ae7e

added curd operations to topic model

Merge pull request #226 from tcet-opensource/205-Adding-CURD-to-Pract…

06e07d1

…ical [Feat]Added CURD to practical.js

Adding the test cases for infrastructure endpoint

5c59794

resolved merge conflict :)

caf7403

fixed eslint + fixed merge conflict

65ebad8

209 model for activity

Merge pull request #248 from tcet-opensource/127-Write_testcases_for_…

e4adcec

…infrastructure_endpointnewbranch 127 write testcases for infrastructure endpointnewbranch

TejasNair9977 requested review from kskarthik5 and Aastha-S-Rai August 27, 2023 06:17

eslint fixes

c876e2e

Aastha-S-Rai approved these changes Aug 27, 2023

View reviewed changes

kskarthik5 approved these changes Aug 27, 2023

View reviewed changes

Merge pull request #266 from tcet-opensource/eslint-hotfix

6963dd3

eslint fixes

TejasNair9977 merged commit 6bbdbc0 into main Aug 27, 2023
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Biweekly Merge #265

Biweekly Merge #265

TejasNair9977 commented Aug 27, 2023

Aastha-S-Rai left a comment

kskarthik5 left a comment

Biweekly Merge #265

Biweekly Merge #265

Conversation

TejasNair9977 commented Aug 27, 2023

Description

Checklist

Aastha-S-Rai left a comment

Choose a reason for hiding this comment

kskarthik5 left a comment

Choose a reason for hiding this comment