Skip to content

Ty/scrum 180 backend integration tests #155

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
Merged
thomasyzy7 merged 37 commits into from
Apr 5, 2025
Merged

Ty/scrum 180 backend integration tests #155

thomasyzy7 merged 37 commits into from
Apr 5, 2025

Conversation

@thomasyzy7
Copy link
Contributor

@thomasyzy7 thomasyzy7 commented Apr 4, 2025

Description

SCRUM-180

Backend integration for timetable generate

Type of change

  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Checklist:

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings

thomasyzy7 and others added 30 commits January 23, 2025 16:36
@thomasyzy7
Update team.md
27e31fa 
Added all team member's phone numbers
@Austin-X
Merge pull request #3 from UTSC-CSCC01-Software-Engineering-I/develop
daad2a4 
Merge the pull_request_template.md file from develop into main
@Austin-X
This commit tests if the main branch actually blocks force-pushes
761a7eb
@Austin-X
Revert "This commit tests if the main branch actually blocks force-pu…
70578b8 
…shes"

This reverts commit 761a7eb.
@thomasyzy7 @minhhaitran08
@kevin-lann @Austin-X @MasahisaSekita
Release/0.1 - Main (#14)
a21f3e3 
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
@Austin-X @kevin-lann
[Hotfix]: Add missing section in README.md for "Tech Stack and Softwa…
ff98df3 
…re Architecture Pattern" - Main (#16)

Co-authored-by: Kevin Lan <[email protected]>
@thomasyzy7 @kevin-lann
@Austin-X @minhhaitran08 @MasahisaSekita
Release/1.0 - Main (#30)
5024884 
Co-authored-by: Kevin Lan <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
@prokopchukdim
Added Sprint0 Rubric + Grades + Deductions (#39)
813595b
@prokopchukdim
Added Sprint 1 Rubric / Grades (#49)
6def085
@thomasyzy7 @kevin-lann
@Austin-X @minhhaitran08 @MasahisaSekita
Release/1.2 - Main (#60)
2699f2a 
Co-authored-by: Kevin Lan <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: MasahisaSekita <[email protected]>
@kevin-lann @thomasyzy7
@Austin-X @minhhaitran08 @MasahisaSekita @prokopchukdim
Release/1.3 [main] (#88)
8f2672f 
Co-authored-by: dawangk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: MasahisaSekita <[email protected]>
Co-authored-by: Dmitriy Prokopchuk <[email protected]>
@kevin-lann @thomasyzy7
@Austin-X @minhhaitran08 @MasahisaSekita @prokopchukdim
Hotfix/1.0.4 [main] (#94)
f797fb3 
Co-authored-by: dawangk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: MasahisaSekita <[email protected]>
Co-authored-by: Dmitriy Prokopchuk <[email protected]>
@prokopchukdim
Sprint 2 rubric (#113)
5974f34
@thomasyzy7 @kevin-lann
@Austin-X @minhhaitran08 @MasahisaSekita @prokopchukdim
Release/1.4 - Main (#126)
21f2214 
Co-authored-by: Kevin Lan <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: MasahisaSekita <[email protected]>
Co-authored-by: Dmitriy Prokopchuk <[email protected]>
@thomasyzy7 @kevin-lann
@Austin-X @minhhaitran08 @MasahisaSekita @prokopchukdim
Release/1.5 (#138)
ab79531 
Co-authored-by: Kevin Lan <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: MasahisaSekita <[email protected]>
Co-authored-by: Dmitriy Prokopchuk <[email protected]>
@kevin-lann
Kl/hotfix 1.0.5 - restriction form bug (#141)
63ed492
@thomasyzy7 @kevin-lann
@Austin-X @minhhaitran08 @MasahisaSekita @prokopchukdim
Hotfix/1.0.6 - main (#144)
00ea3fb 
Co-authored-by: Kevin Lan <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: MasahisaSekita <[email protected]>
Co-authored-by: Dmitriy Prokopchuk <[email protected]>
@thomasyzy7
refactored the test files in backend
543f8ca
@github-actions
Auto-formatted the code using Prettier
39ef622
@thomasyzy7
refactored testing files
004d238
@thomasyzy7
Merge branch 'ty/scrum-180-backend-integration-tests' of https://gith…
2450e8e 
…ub.com/UTSC-CSCC01-Software-Engineering-I/term-group-project-c01w25-project-course-matrix into ty/scrum-180-backend-integration-tests
@github-actions
Auto-formatted the code using Prettier
8bce802
@thomasyzy7
getOfferings unit test
4483b62
@github-actions
Auto-formatted the code using Prettier
866de6e
@thomasyzy7
timetableGeneration progress
118dd4d
@thomasyzy7
Merge branch 'ty/scrum-180-backend-integration-tests' of https://gith…
8ff7678 
…ub.com/UTSC-CSCC01-Software-Engineering-I/term-group-project-c01w25-project-course-matrix into ty/scrum-180-backend-integration-tests
@minhhaitran08
Update db response for timetable integration test
54648b8
@minhhaitran08 @github-actions
Auto-formatted the code using Prettier
5167eb8
@thomasyzy7
Merge branch 'ty/scrum-180-backend-integration-tests' of https://gith…
66db7ad 
…ub.com/UTSC-CSCC01-Software-Engineering-I/term-group-project-c01w25-project-course-matrix into ty/scrum-180-backend-integration-tests
@github-actions
Auto-formatted the code using Prettier
e4110d0
@thomasyzy7 thomasyzy7 changed the base branch from main to develop April 4, 2025 21:23
Austin-X
Austin-X requested changes Apr 4, 2025
View reviewed changes
Copy link
Contributor

@Austin-X Austin-X left a comment

Choose a reason for hiding this comment

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

I think you handled the merge conflicts incorrectly because there shouldn't be any changes to the frontend directory in this PR

MasahisaSekita
MasahisaSekita approved these changes Apr 5, 2025
View reviewed changes
Copy link
Contributor

@MasahisaSekita MasahisaSekita left a comment

Choose a reason for hiding this comment

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

I rand the tests and they seemed to be all good. Every test was passed.

@thomasyzy7 thomasyzy7 requested a review from Austin-X April 5, 2025 00:55
@thomasyzy7 thomasyzy7 merged commit 4b84cd3 into develop Apr 5, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Austin-X Austin-X Austin-X approved these changes

@kevin-lann kevin-lann kevin-lann approved these changes

@MasahisaSekita MasahisaSekita MasahisaSekita 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.

7 participants

@thomasyzy7 @Austin-X @kevin-lann @MasahisaSekita @prokopchukdim @minhhaitran08