Skip to content
Snippets Groups Projects
Commit a42a6e7a authored by fz2907's avatar fz2907
Browse files

Fixed a match bug

parent 25b1c189
No related branches found
No related tags found
1 merge request!37Start AgreedMatchPage to show the ongoing matches and history matches for user...
Hide whitespace changes
Inline Side-by-side
BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/controllers/InteractiveController.java
+ 8
− 4
View file @ a42a6e7a
......@@ -136,11 +136,13 @@ public class InteractiveController {
if("offer".equals(newData.get("see").toString())) {
MatchedWishlistRecordModel history = matchedWishlistRecordService.getHistoryFromDB(Long.parseLong(newData.get("offerId").toString()), Long.parseLong(newData.get("wishlistId").toString()));
history.setOfferResult(LookupTables.MATCHING_RECORD_USER_RESULT.Declined);
matchedWishlistRecordService.updateToDB(history);
MatchedWishlistRecordModel record = matchedWishlistRecordService.updateToDB(history);
matchedWishlistRecordService.hostReject(record);
} else {
MatchedWishlistRecordModel history = matchedWishlistRecordService.getHistoryFromDB(Long.parseLong(newData.get("offerId").toString()), Long.parseLong(newData.get("wishlistId").toString()));
history.setWishlistResult(LookupTables.MATCHING_RECORD_USER_RESULT.Declined);
matchedWishlistRecordService.updateToDB(history);
MatchedWishlistRecordModel record = matchedWishlistRecordService.updateToDB(history);
matchedWishlistRecordService.visitorReject(record);
}
} else {
if(result.getPhone1() == null) {
......@@ -155,11 +157,13 @@ public class InteractiveController {
if("offer".equals(newData.get("see").toString())) {
MatchedWishlistRecordModel history = matchedWishlistRecordService.getHistoryFromDB(Long.parseLong(newData.get("offerId").toString()), Long.parseLong(newData.get("wishlistId").toString()));
history.setOfferResult(LookupTables.MATCHING_RECORD_USER_RESULT.Declined);
matchedWishlistRecordService.updateToDB(history);
MatchedWishlistRecordModel record = matchedWishlistRecordService.updateToDB(history);
matchedWishlistRecordService.hostReject(record);
} else {
MatchedWishlistRecordModel history = matchedWishlistRecordService.getHistoryFromDB(Long.parseLong(newData.get("offerId").toString()), Long.parseLong(newData.get("wishlistId").toString()));
history.setWishlistResult(LookupTables.MATCHING_RECORD_USER_RESULT.Declined);
matchedWishlistRecordService.updateToDB(history);
MatchedWishlistRecordModel record = matchedWishlistRecordService.updateToDB(history);
matchedWishlistRecordService.visitorReject(record);
}
}
response.setMessage("Saved successfully");
......
BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/jobs/OfferWishlistMatchingJob.java
+ 2
− 2
View file @ a42a6e7a
......@@ -285,8 +285,8 @@ public class OfferWishlistMatchingJob {
List<MatchedWishlistRecordModel> matchedRecordList = offerList.parallelStream()
.filter(offer-> isWithin(wishlistItem.getStartTime(),wishlistItem.getEndTime(),
offer.getStartTime(),offer.getEndTime()) && checkAgreedOfferTime(offer, wishlistItem))
.map(offer -> new MatchedWishlistRecordModel(wishlistItem.getWishlistItemId(),
offer.getOfferId(), LookupTables.MATCHING_RECORD_USER_RESULT.Waiting,
.map(offer -> new MatchedWishlistRecordModel(offer.getOfferId(),
wishlistItem.getWishlistItemId(), LookupTables.MATCHING_RECORD_USER_RESULT.Waiting,
LookupTables.MATCHING_RECORD_USER_RESULT.Waiting,
wishlistItem.getStartTime(), wishlistItem.getEndTime()))
.toList();
......
BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/services/MatchedWishlistRecordService.java
+ 14
− 10
View file @ a42a6e7a
......@@ -58,7 +58,11 @@ public class MatchedWishlistRecordService {
}
public MatchedWishlistRecordModel updateToDB(MatchedWishlistRecordModel updateData) {
matchedWishlistRecordRepository.save(updateData);
updateData = matchedWishlistRecordRepository.save(updateData);
if(updateData.getOfferResult() == LookupTables.MATCHING_RECORD_USER_RESULT.Accepted &&
updateData.getWishlistResult() == LookupTables.MATCHING_RECORD_USER_RESULT.Accepted){
visitorAccepted(updateData);
}
return updateData;
}
......@@ -76,9 +80,9 @@ public class MatchedWishlistRecordService {
}
}
public void hostReject(Long offerId, Long wishlistId){
MatchedWishlistRecordModel record = matchedWishlistRecordRepository
.findByOfferIdAndWishlistItemId(offerId, wishlistId);
public void hostReject(MatchedWishlistRecordModel record){
Long wishlistId = record.getWishlistItemId();
Long offerId = record.getOfferId();
if(record != null){
record.setOfferResult(LookupTables.MATCHING_RECORD_USER_RESULT.Declined);
if(record.getAgreedRecordId() != null){
......@@ -93,9 +97,9 @@ public class MatchedWishlistRecordService {
}
}
public void visitorReject(Long offerId, Long wishlistId){
MatchedWishlistRecordModel record = matchedWishlistRecordRepository
.findByOfferIdAndWishlistItemId(offerId, wishlistId);
public void visitorReject(MatchedWishlistRecordModel record){
Long wishlistId = record.getWishlistItemId();
Long offerId = record.getOfferId();
if(record != null){
record.setWishlistResult(LookupTables.MATCHING_RECORD_USER_RESULT.Declined);
if(record.getAgreedRecordId() != null){
......@@ -110,9 +114,9 @@ public class MatchedWishlistRecordService {
}
}
public void visitorAccepted(Long offerId, Long wishlistId){
MatchedWishlistRecordModel record = matchedWishlistRecordRepository
.findByOfferIdAndWishlistItemId(offerId, wishlistId);
public void visitorAccepted(MatchedWishlistRecordModel record){
Long offerId = record.getOfferId();
Long wishlistId = record.getWishlistItemId();
if(record != null){
record.setWishlistResult(LookupTables.MATCHING_RECORD_USER_RESULT.Accepted);
UserOfferModel offerModel = userOfferRepository.findByUserId(offerId);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment