Merge branch '2023_CR' into 2023_CR2

jack

2023-07-21 785a57e89f99ec350f029f9a85a450839324babf

 PAMapp/store/index.ts

@@ -1,23 +1,27 @@
import { Module, VuexModule, Mutation, Action } from 'vuex-module-decorators'

import myConsultantService from '~/shared/services/my-consultant.service';
import queryConsultantService from '~/shared/services/query-consultant.service';
import queryConsultantService, { AddFavoriteConsultantItem } from '~/shared/services/query-consultant.service';
import reviewsService from '~/shared/services/reviews.service';
import { Consultant } from '~/shared/models/consultant.model';
import { Consultant, ConsultantWithAppointmentId } 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';
import {AccessFroms} from "~/shared/services/utils.service";

@Module
export default class Store extends VuexModule {
    recommendList: Consultant[] = [];
    strictQueryList: AgentOfStrictQuery[] = [];
    myConsultantList: Consultant[] = [];
    myAppointmentGroupByConsultantList: ConsultantWithAppointmentId[] = [];

    reviewLogList: AppointmentLog[] = [];
    unReviewLogList: AppointmentLog[] = [];
    notificationList: NotificationList[] = [];

    accessFrom: AccessFroms | null = null;

    get isUserLogin() {
        return this.context.getters['localStorage/isUserLogin'];
@@ -28,6 +32,15 @@
      return perfectMatchList.length > 5
            ? perfectMatchList
            : this.strictQueryList;
    }

    get fromAccess(): AccessFroms | null {
      return this.accessFrom;
    }

    @Mutation
    setAccessSource(from: AccessFroms) {
      this.accessFrom = from;
    }

    @Mutation
@@ -60,6 +73,11 @@
        this.notificationList = data;
    }

    @Mutation
    updateAppointmentGroupByConsultantList(data: ConsultantWithAppointmentId[]) {
      this.myAppointmentGroupByConsultantList = data;
    }

    @Action
    storeRecommendList() {
        queryConsultantService.getRecommendConsultantList().then(data => {
@@ -78,14 +96,18 @@


        if (localData?.length) {
            const agentNoList = localData.map(i => i.agentNo)
            await queryConsultantService.addFavoriteConsultant(agentNoList).then(res => {
            const addFavoriteAgentList: AddFavoriteConsultantItem[] = localData.map(i => ({ agentNo: i.agentNo, createdTime: i.updateTime}));
            await queryConsultantService.addFavoriteConsultant(addFavoriteAgentList).then(res => {
                localStorage.removeItem('favoriteConsultant')
            })
        }

        myConsultantService.getFavoriteConsultantList().then(data => {
            this.context.commit('updateConsultantList', data);
        })

        myConsultantService.getAllGroupByConsultant().then((data) => {
          this.context.commit('updateAppointmentGroupByConsultantList', data);
        })
    }

@@ -114,7 +136,7 @@
            if (!found) {
                const newData = [consultantToAdd].concat(this.myConsultantList);
                if (this.isUserLogin) {
                    await queryConsultantService.addFavoriteConsultant([consultantToAdd.agentNo])
                    await queryConsultantService.addFavoriteConsultant([{ agentNo: consultantToAdd.agentNo, createdTime: consultantToAdd.updateTime  }])
                } else {
                    setFavoriteToStorage(newData);
                }