From c047a3336ff1efc7d21edee6f0c8811264eebae7 Mon Sep 17 00:00:00 2001 From: Mila <Mila@pollex.com.tw> Date: 星期六, 22 一月 2022 15:25:32 +0800 Subject: [PATCH] update: TODO#134222/134105 通知小鈴鐺/取得待評分的滿意度清單, 串接api --- PAMapp/store/index.ts | 100 +++++++++++++++++++++++++++---------------------- 1 files changed, 55 insertions(+), 45 deletions(-) diff --git a/PAMapp/store/index.ts b/PAMapp/store/index.ts index b26be7e..9abd165 100644 --- a/PAMapp/store/index.ts +++ b/PAMapp/store/index.ts @@ -1,10 +1,13 @@ import { Module, VuexModule, Mutation, Action } from 'vuex-module-decorators' -import { ClientInfo, getMyAppointmentList, getMyReviewLog } from '~/assets/ts/api/appointment'; -import { recommend, AgentOfStrictQuery, getFavoriteConsultant, addFavoriteConsultant, deleteConsultant, strictQuery } from '~/assets/ts/api/consultant'; -import { Consultant } from '~/assets/ts/models/consultant.model'; -import { AppointmentLog } from '~/assets/ts/models/appointment.model'; -import { getFavoriteFromStorage, setFavoriteToStorage } from '~/assets/ts/storageConsultant'; -import { Role } from '~/assets/ts/models/enum/Role'; + +import myConsultantService from '~/shared/services/my-consultant.service'; +import queryConsultantService from '~/shared/services/query-consultant.service'; +import reviewsService from '~/shared/services/reviews.service'; +import { Consultant } from '~/shared/models/consultant.model'; +import { getFavoriteFromStorage, setFavoriteToStorage } from '~/shared/storageConsultant'; +import { AppointmentLog } from '~/shared/models/appointment.model'; +import { AgentOfStrictQuery, StrictQueryParams } from '~/shared/models/strict-query.model'; +import { NotificationList } from '~/shared/models/reviews.model'; @Module export default class Store extends VuexModule { @@ -12,36 +15,47 @@ strictQueryList: AgentOfStrictQuery[] = []; myConsultantList: Consultant[] = []; - myAppointmentList: ClientInfo[] = []; - - myAppointmentReviewLogList: AppointmentLog[] = []; + reviewLogList: AppointmentLog[] = []; + unReviewLogList: AppointmentLog[] = []; + notificationList: NotificationList[] = []; get isUserLogin() { return this.context.getters['localStorage/isUserLogin']; } - @Mutation updateRecommend(data: Consultant[]) { - this.recommendList = data; + @Mutation + updateRecommend(data: Consultant[]) { + this.recommendList = data; } - @Mutation updateConsultantList(data: Consultant[]) { + @Mutation + updateConsultantList(data: Consultant[]) { this.myConsultantList = data; } - @Mutation updateStrictQueryList(data: AgentOfStrictQuery[]) { + @Mutation + updateStrictQueryList(data: AgentOfStrictQuery[]) { this.strictQueryList = data; } - @Mutation updateMyAppointmentList(data: ClientInfo[]) { - this.myAppointmentList = data; + @Mutation + updateReviewLog(data: AppointmentLog[]) { + this.reviewLogList = data; } - @Mutation updateMyAppointmentReviewLog(data: AppointmentLog[]) { - this.myAppointmentReviewLogList = data; + @Mutation + updateUnReviewLog(data: AppointmentLog[]) { + this.unReviewLogList = data; } - @Action storeRecommendList() { - recommend().then(data => { + @Mutation + updateNotification(data: NotificationList[]) { + this.notificationList = data; + } + + @Action + storeRecommendList() { + queryConsultantService.getRecommendConsultantList().then(data => { this.context.commit('updateRecommend', data) }) } @@ -58,13 +72,13 @@ if (localData?.length) { const agentNoList = localData.map(i => i.agentNo) - await addFavoriteConsultant(agentNoList).then(res => { + await queryConsultantService.addFavoriteConsultant(agentNoList).then(res => { localStorage.removeItem('favoriteConsultant') }) } - getFavoriteConsultant().then(data => { - this.context.commit('updateConsultantList', data) + myConsultantService.getFavoriteConsultantList().then(data => { + this.context.commit('updateConsultantList', data); }) } @@ -78,7 +92,7 @@ if (!this.isUserLogin) { setFavoriteToStorage(left); } else { - await deleteConsultant(agentNo) + await myConsultantService.deleteConsultant(agentNo) } this.context.commit('updateConsultantList', left) @@ -93,7 +107,7 @@ if (!found) { const newData = [consultantToAdd].concat(this.myConsultantList); if (this.isUserLogin) { - await addFavoriteConsultant([consultantToAdd.agentNo]) + await queryConsultantService.addFavoriteConsultant([consultantToAdd.agentNo]) } else { setFavoriteToStorage(newData); } @@ -108,16 +122,8 @@ } @Action - async storeMyAppointmentList() { - return await getMyAppointmentList().then((data) => { - this.context.commit('updateMyAppointmentList', data); - return data.filter(item => !item.consultantViewTime || item.consultantViewTime === null).length - }); - } - - @Action storeMyAppointmentReviewLog() { - getMyReviewLog().then((data) => { + reviewsService.getMyReviewLog().then((data) => { const dataWithLatestDate = data.map((item) => { return { ...item, @@ -125,23 +131,27 @@ } }); const sortedData = dataWithLatestDate.sort((a, b) => +b.compareDate - +a.compareDate); - this.context.commit('updateMyAppointmentReviewLog', sortedData); + const reviewLog = sortedData.filter(item => item.score); + const unReviewLog = sortedData.filter(item => !item.score); + this.context.commit('updateReviewLog', reviewLog); + this.context.commit('updateUnReviewLog', unReviewLog); }); - } - - @Action updateMyAppointment(myAppointment: ClientInfo) { - const data = this.myAppointmentList.filter(item => item.id !== myAppointment.id); - data.unshift(myAppointment); - this.context.commit('updateMyAppointmentList', data) } @Action - async storeStrictQueryList(strictQueryDto) { - return await strictQuery(strictQueryDto).then(res=>{ + async storeStrictQueryList(strictQueryDto: StrictQueryParams) { + return await queryConsultantService.strictQuery(strictQueryDto).then(res=>{ this.context.commit('localStorage/storageRecommendConsultant', JSON.stringify(strictQueryDto)); - this.context.commit('updateStrictQueryList', res.data) - return res.data.length; + this.context.commit('updateStrictQueryList', res) + return res.length; }); } -} \ No newline at end of file + @Action + storeMyPersonalNotification() { + reviewsService.getMyPersonalNotification().then(data => { + this.context.commit('updateNotification', data); + }) + } + +} -- Gitblit v1.9.3