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.

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

Implemented: Bulk API calls to add facility to group and to update facility to group on Manage Facilities page.(#339) #345

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/services/FacilityService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,24 @@ const updateProductStoreFacilityGroup = async (payload: any): Promise<any> => {
})
}

const addFacilitiesToGroup = async (payload: any): Promise<any> => {
return api({
url: "service/addFacilitiesToGroup",
method: "post",
data: payload
})
}

const updateFacilitiesToGroup = async (payload: any): Promise<any> => {
return api({
url: "service/updateFacilitiesToGroup",
method: "post",
data: payload
})
}

export const FacilityService = {
addFacilitiesToGroup,
addFacilityToGroup,
addPartyToFacility,
associateCalendarToFacility,
Expand Down Expand Up @@ -864,6 +881,7 @@ export const FacilityService = {
updateFacilityLocation,
updateFacilityPostalAddress,
updateFacilityTelecomNumber,
updateFacilitiesToGroup,
updateFacilityToGroup,
updateProductStoreFacility,
updateProductStoreFacilityGroup,
Expand Down
4 changes: 2 additions & 2 deletions src/views/FacilityDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,7 @@ export default defineComponent({
});
} else {
const groupInformation = this.current.groupInformation.find((group: any) => group.facilityGroupId === facilityGroupId)
resp = await await FacilityService.updateFacilityToGroup({
resp = await FacilityService.updateFacilityToGroup({
"facilityId": this.current.facilityId,
"facilityGroupId": facilityGroupId,
"fromDate": groupInformation.fromDate,
Expand Down Expand Up @@ -1014,7 +1014,7 @@ export default defineComponent({
successMessage = translate('is now selling on', { "facilityName": this.current.facilityName, "facilityGroupId": facilityGroup.facilityGroupName });
} else {
const groupInformation = this.current.groupInformation.find((group: any) => group.facilityGroupId === facilityGroup.facilityGroupId)
resp = await await FacilityService.updateFacilityToGroup({
resp = await FacilityService.updateFacilityToGroup({
"facilityId": this.current.facilityId,
"facilityGroupId": facilityGroup.facilityGroupId,
"fromDate": groupInformation.fromDate,
Expand Down
93 changes: 63 additions & 30 deletions src/views/ManageFacilities.vue
Original file line number Diff line number Diff line change
Expand Up @@ -315,48 +315,81 @@
const facilitiesToAdd = this.selectedFacilities.filter((facility: any) => !memberFacilityIds.includes(facility.facilityId))
const selectedFacilityIds = this.selectedFacilities ? new Set(this.selectedFacilities.map((facility:any) => facility.facilityId)) as any : [];
const facilitiesToRemove = this.memberFacilities.filter((facility: any) => !selectedFacilityIds.has(facility.facilityId))

if(facilitiesToRemove.length > 0){
try{
const removeResponse = await FacilityService.updateFacilitiesToGroup({
"payload": {
"facilityList": facilitiesToRemove.map((facility: any) => ({
"facilityGroupId": this.facilityGroupId,
"facilityId": facility.facilityId,
"fromDate": facility.fromDate,
"thruDate": DateTime.now().toMillis()
}))
}
})

if(hasError(removeResponse)){
throw removeResponse
}
showToast(translate("Member facilities updated successfully."))
}catch(error){
showToast(translate("Failed to update some member facilities."))
Copy link
Contributor

Choose a reason for hiding this comment

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

log the error on console

}
}

const removeResponses = await Promise.allSettled(facilitiesToRemove
.map((facility: any) => FacilityService.updateFacilityToGroup({
"facilityId": facility.facilityId,
"facilityGroupId": facility.facilityGroupId,
"fromDate": facility.fromDate,
"thruDate": DateTime.now().toMillis()
}))
)
if(facilitiesToAdd.length > 0){
try{
const addResponse = await FacilityService.addFacilitiesToGroup({
"payload": {
"facilityList": facilitiesToAdd.map((facility: any) => ({
"facilityGroupId": this.facilityGroupId,
"facilityId": facility.facilityId,
"sequenceNum": facility.sequenceNum
}))
}
})

const addResponses = await Promise.allSettled(facilitiesToAdd
.map((facility: any) => FacilityService.addFacilityToGroup({
"facilityId": facility.facilityId,
"facilityGroupId": this.facilityGroupId,
"sequenceNum": facility.sequenceNum
}))
)
if(hasError(addResponse)){
throw addResponse
}
showToast(translate("Member facilities updated successfully."))
}catch(error){
showToast(translate("Failed to update some member facilities."))
}
}

const facilityIdsToAdd = facilitiesToAdd ? new Set(facilitiesToAdd.map((facility:any) => facility.facilityId)) as any : [];
const existingFacilityMembers = this.selectedFacilities.filter((facility:any) => !facilityIdsToAdd.has(facility.facilityId))
const diffMemberFacilitySequencing = existingFacilityMembers.filter((facility: any) => this.memberFacilities.some((memberFacility: any) => memberFacility.facilityId === facility.facilityId && memberFacility.sequenceNum !== facility.sequenceNum))

const memberFacilityDetail = this.memberFacilities.reduce((memberInfo:any, facility:any) => {
memberInfo[facility.facilityId] = facility;
return memberInfo;
}, {});
}, {})

const sequenceUpdateResponses = await Promise.allSettled(diffMemberFacilitySequencing.map((memberFacility: any) => {
FacilityService.updateFacilityToGroup({
"facilityId": memberFacility.facilityId,
"facilityGroupId": this.facilityGroupId,
"fromDate": memberFacilityDetail[memberFacility.facilityId].fromDate,
"sequenceNum": memberFacility.sequenceNum
});
}))
if(diffMemberFacilitySequencing.length > 0){
try{
const sequenceUpdateResponse = await FacilityService.updateFacilitiesToGroup({
"payload": {
"facilityList": diffMemberFacilitySequencing.map((memberFacility: any) => ({
"facilityGroupId": this.facilityGroupId,
"facilityId": memberFacility.facilityId,
"fromDate": memberFacilityDetail[memberFacility.facilityId].fromDate,
"sequenceNum": memberFacility.sequenceNum
}))
}
})

const hasFailedResponse = [...removeResponses, ...addResponses, ...sequenceUpdateResponses].some((response: any) => response.status === 'rejected')
if (hasFailedResponse) {
showToast(translate("Failed to update some member facilities."))
} else {
showToast(translate("Member facilities updated successfully."))
if(hasError(sequenceUpdateResponse)){
throw sequenceUpdateResponse
}
showToast(translate("Member facilities updated successfully."))
}catch(error){
showToast(translate("Failed to update some member facilities."))
}
}

this.isFacilityMembersModified = false;
this.router.push({ path: `/tabs/find-groups` })
},
Expand Down
Loading