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

Add and integrate match service #56

Merged
merged 28 commits into from
Oct 20, 2024
Merged

Add and integrate match service #56

merged 28 commits into from
Oct 20, 2024

Conversation

samuelim01
Copy link

@samuelim01 samuelim01 commented Oct 20, 2024 •
edited by McNaBry
Loading

Description

Create and integrated match service with frontend.

  • Match service with API calls, and consumers and producers using RabbitMQ (for now).
  • Documentation and logging for match service
  • Integrate match service with matching page for initial match request, cancellation, and polling of match request status
  • Frontend timer on match page
  • Docker dependencies to ensure services do not fail to start up, especially match service due to a dependency on RabbitMQ.

Checklist

  • I have updated documentation
  • All tests passing

Screenshots (if applicable)

image
image
image

samuelim01 and others added 27 commits October 20, 2024 19:22
@samuelim01
Initialize Match Service
5b68ad9
@samuelim01
User: Remove extra fields
5da51fc
@samuelim01
Match: Implement /request routes
bff0504
@samuelim01
Match: Move DB logic into repository.ts
aaf1ce0
@samuelim01
Match: Init message broker
c3bd798
@samuelim01
Match: Add endpoints and consumers
164b5a4
@samuelim01
Small fixes
0d3e85e 
* Fix minor typos
* Modify requests to use POST body rather than query params
* Ensure match request only finds requests within valid time
@samuelim01
Match: Use gateway
b7b84ea
@samuelim01
Add Match Service
2cd617c
@McNaBry @samuelim01
Integrate matching into frontend
248ea90
@McNaBry @samuelim01
Add handling for timeout and cancellation of match
8004d5e
@samuelim01
Fix dependency issues
10a5c44
@samuelim01
Ensure logging for each match request
331fc33
@samuelim01 @McNaBry
Fix recursive call to closeDialog()
9f9dee0 
Co-authored-by: Bryan Lee <[email protected]>
@samuelim01 @McNaBry
Implement match frontend timer
db84f12 
* Fix one minute being defined as 20 seconds on match service

Co-authored-by: Bryan Lee <[email protected]>
@samuelim01
Integrate navbar
7422aa9
@samuelim01
Minor code clean up
ede8065
@samuelim01
Reroute login to /matching
ea0e240
@McNaBry @samuelim01
Clean up match frontend code
b59f678 
* Reorder function declarations for finding match dialog
* Remove unecessary comments
@McNaBry @samuelim01
Add loading state for start matching button when initiating a match
bf06529
@McNaBry @samuelim01
Adjust height of matching component
d980262
@samuelim01
Extend healthcheck time for broker
516214b
@samuelim01
Refactor match service: PUT /request
2e005c6 
* Simplified the endpoint to solely reset the validity of the match request, removing any unnecessary code.
@samuelim01
Move match DB methods into repository.ts
4b54aa1
@samuelim01
Add Match Service README
bf2d6de 
* Fix minor typos
* Fix DB calls not returning updated objects
@samuelim01
Enable tests for match service
b0fe20f
@samuelim01
Clean up code
fd75363
@McNaBry McNaBry added this to the Milestone 4 milestone Oct 20, 2024
@McNaBry McNaBry linked an issue Oct 20, 2024 that may be closed by this pull request
Add Match Service #13
Closed
@limcaaarl
Copy link

Bug: A user can have multiple instances of match found.

Steps:

  1. Open 2 tabs for user1, and another 2 tabs for user2.
  2. Select and match the preferences as per usual, such that the first tab for both user1 and user2 have common topics and same difficulty and the same for the second tab for both user1 and user2.
  3. Start matching
  4. Match found will be triggered for both tabs for both users, resulting in 2 instances of match found for both users.

@samuelim01
Copy link
Author

Bug: A user can have multiple instances of match found.

Steps:

  1. Open 2 tabs for user1, and another 2 tabs for user2.
  2. Select and match the preferences as per usual, such that the first tab for both user1 and user2 have common topics and same difficulty and the same for the second tab for both user1 and user2.
  3. Start matching
  4. Match found will be triggered for both tabs for both users, resulting in 2 instances of match found for both users.

This was intended behaviour, such that a user can be in multiple sessions at the same time. However, a user will not pair up with themselves.

@McNaBry
Fix bug with clearing topics input on match page
899d47c 
* When clearing the input field, topics is temporarily set to null before the onClear event is emitted
* This causes hasQuestionsValidator to reference a null variable
* The fix is to add an additional Validators.required to prevent hasQuestionsValidator from firing before topics is set to an empty array
limcaaarl
limcaaarl approved these changes Oct 20, 2024
View reviewed changes
Copy link

@limcaaarl limcaaarl left a comment

Choose a reason for hiding this comment

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

LGTM!

McNaBry
McNaBry approved these changes Oct 20, 2024
View reviewed changes
Copy link

@McNaBry McNaBry left a comment

Choose a reason for hiding this comment

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

LGTM

@samuelim01 samuelim01 merged commit b13bd16 into main Oct 20, 2024
4 checks passed
KhoonSun47 added a commit to KhoonSun47/cs3219-ay2425s1-project-g03 that referenced this pull request Oct 23, 2024
@KhoonSun47
Merge branch 'main' into combine-room-and-collab-1
2c272de 
* main:
  Add and integrate match service (CS3219-AY2425S1#56)
  Add Match Page (CS3219-AY2425S1#44)

# Conflicts:
#	compose.dev.yml
#	compose.yml
#	frontend/src/app/app.routes.ts
@samuelim01 samuelim01 deleted the match-service branch October 31, 2024 04:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@limcaaarl limcaaarl limcaaarl approved these changes

@McNaBry McNaBry McNaBry approved these changes

Assignees

@McNaBry McNaBry

@samuelim01 samuelim01

Labels
frontend priority.High service.Match
Projects
None yet
Milestone
Milestone 4
Development

Successfully merging this pull request may close these issues.

Add Match Service
3 participants
@samuelim01 @limcaaarl @McNaBry