Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Biweekly Merge #450

Merged
merged 46 commits into from
Nov 9, 2023
Merged

Biweekly Merge #450

merged 46 commits into from
Nov 9, 2023

Conversation

TejasNair9977
Copy link
Member

just a biweekly merge to main

callistox9 and others added 30 commits October 22, 2023 10:53
@callistox9
minor_typo corrected
19550ef
@TejasNair9977
Merge pull request #416 from callistox9/typo_readme
8b362d7 
minor_typo corrected
@TejasNair9977
added mock data for accred, org, infra, department, topics, modules, …
7537299 
…major fixes
@Gauravpadam
docker compose added for handling replicaSets
0628964
@TejasNair9977 @Gauravpadam
fixed dockerfile
b60d7c2 
Co-authored-by: Gaurav Padam <[email protected]>
@TejasNair9977
used mongo instead of bitnami
7c49e5a
@TejasNair9977
added .env back to dockerignore
4c412ed
@TejasNair9977
Merge pull request #417 from Gauravpadam/20232610_docker_compose_for_…
5118489 
…replicaSets

Docker compose for handling Mongo replicaSets
@TejasNair9977
added faker for courses and everything under
cac9c58
@TejasNair9977
completed course additions for placeholder data
9fb5d9e
@kskarthik5
Merge pull request #418 from tcet-opensource/414-filldbwithplaceholde…
186eb66 
…rdata

Filled DB with placeholder data
Initialize-all-the-test-data-in-setup.js-using-spawn
1c4b14d
Fixed the error while closing the child process
57e05c8
@Shubhangam333
feat: added validation to exam controller
0f63d5b
@TejasNair9977
Merge pull request #437 from tcet-opensource/feat-436-Initialize-all-…
ff1d374 
…test-data-in-setup.js

Feat: Initialize all test data in setup.js
@TejasNair9977
made middleware more portable and usable
80e0d14
@TejasNair9977
Merge pull request #438 from Shubhangam333/devteam
795addf 
[FEATURE]: [Added Validation for Exam]
@TejasNair9977
Rename EntityIdValidation.js to entityIdValidation.js
0b2046e 
hotpatch
@Aastha-S-Rai
used middleware validate service for validating ids in controller's c…
db5e13e 
…ourse.js file
@harsh31dangi
Added validation for Student entity
eea7c70
@shreyam462
[Added]validation for group
b5767ec
@sumitst05
added validation for timetable
61f8ac6
@sumitst05
fixed schema definition error in activity blueprint
2ef73e0
@deepti-50
[added]
15b64db
@deepti-50
Updated module.js
eb4bf72
@Gauravpadam
Docker compose refining
aab4309
@TejasNair9977 @Gauravpadam
fixed replica sets on docker-compose
2461a04 
Co-authored-by: Gaurav Padam <[email protected]>
@TejasNair9977
added mocks for even more models
6233d2b
@harshau007
Create deploy.yml
03684f0
@TejasNair9977
added all remaining mockDBs
403e24b
TejasNair9977 and others added 16 commits November 7, 2023 00:59
@TejasNair9977
resolved a stupid merge im so dumb
a181113
@TejasNair9977
fixed small error with activity
24d22da
@harshau007
Rename deploy.yml to dockerhub.yml
d98dfbe
@TejasNair9977
added a mongo memory server for testing
b7b9c88
@TejasNair9977
Merge pull request #446 from tcet-opensource/mockhotfix
52d2fb0 
added mocks for even more models
@TejasNair9977
Merge branch 'development' into 20233110_docker_compose_refining
4af0b36
@TejasNair9977
Merge pull request #445 from Gauravpadam/20233110_docker_compose_refi…
83418f3 
…ning

Docker compose refining
@TejasNair9977
Merge pull request #447 from harshau007/dockerhub-img-upload
1956e3b 
Action for Docker Img Upload
@TejasNair9977
Merge pull request #444 from tcet-opensource/426-added-validation-for…
81a3509 
…-module

[ADDED]Added validation for module.
@TejasNair9977
Merge pull request #440 from harsh31dangi/430-Student-Validation
0f0e834 
Feat : 430 Adds validation before creating a new Student
@TejasNair9977
Merge pull request #439 from tcet-opensource/420-feat-add-validation-…
22235ee 
…for-course

validating IDs in for course
@TejasNair9977
Merge pull request #441 from tcet-opensource/425-add-validation-for-g…
aabfee3 
…roup

[Added]validation for group
@TejasNair9977
Merge branch 'development' into validation-for-timetable
641e092
@TejasNair9977
Merge pull request #442 from tcet-opensource/validation-for-timetable
7633aaf 
[Added]: Validation for timetable
@TejasNair9977
fixed all testcases
411b5a0
@TejasNair9977
Merge pull request #449 from tcet-opensource/testcasehotfix
09824b0 
fixed all testcases
rahulsingh2312
rahulsingh2312 approved these changes Nov 9, 2023
View reviewed changes
Copy link
Member

@rahulsingh2312 rahulsingh2312 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !

@TejasNair9977 TejasNair9977 merged commit 0f4da0a into main Nov 9, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Abhishekgoyal007 Abhishekgoyal007 Abhishekgoyal007 approved these changes

@rahulsingh2312 rahulsingh2312 rahulsingh2312 approved these changes

@Aastha-S-Rai Aastha-S-Rai Aastha-S-Rai approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.