@redneckz/wildless-cms-uni-blocks 0.14.1028 → 0.14.1029

package/mobile/src/components/ApplicationLeadForm/useLeadFormStore.ts

@@ -8,7 +8,8 @@ export interface LeadFormStoreSlice {
   leadForm: LeadFormState;
   taskId: number;
   profileId: Nullable<number>;
-  participantId: number;
+  userId: Nullable<string | number>;
+  participantId: string | number;
   programId: string;
   productType: ProductType;
   referalData: ReferalData;

package/mobile/src/components/ApplicationLeadForm/useSaveUserData.ts

@@ -4,9 +4,10 @@ import { type Nullable } from '../../utils/Nullable';
 import { useLeadFormStore } from './useLeadFormStore';
 
 export interface UserData {
-  participantId: number;
+  participantId: string | number;
   taskId: number;
   profileId?: Nullable<number>;
+  userId?: Nullable<string | number>;
   programId: string;
   formData: LeadFormState;
 }
@@ -14,10 +15,18 @@ export const useSaveUserData = () => {
   const leadFormStore = useLeadFormStore();
 
   return useCallback(
-    ({ participantId, taskId, profileId, programId: programNumber, formData }: UserData) => {
+    ({
+      participantId,
+      taskId,
+      userId,
+      profileId,
+      programId: programNumber,
+      formData,
+    }: UserData) => {
       leadFormStore.participantId = participantId;
       leadFormStore.taskId = taskId;
       leadFormStore.profileId = profileId;
+      leadFormStore.userId = userId;
       leadFormStore.programId = programNumber;
       leadFormStore.leadForm = formData;
     },

package/mobile/src/components/ApplicationLeadForm/useSendLeadFormAspects.tsx

@@ -9,7 +9,7 @@ export const useSendLeadFormAspects = ({ data }: AspectsProps) => {
   const aspects = useAspects();
 
   return useCallback(
-    (ProfileId: number, TaskId: number) => {
+    (ProfileId: string | number, TaskId: number) => {
       const snowplowParams = JSON.stringify({
         ProfileId,
         TaskId,

package/mobile/src/components/CreditCardForm/getCreditCardFormTaskData.ts

@@ -12,7 +12,7 @@ import {
 } from './getDeliveryCreditCardData';
 
 type getCreditCardFormTaskDataProps = {
-  participantId: number;
+  participantId: string | number;
   taskId: number;
   profileId: number;
   formData: LeadFormState;

package/mobile/src/components/DebitForm/getDebitCardFormTaskData.ts

@@ -12,7 +12,7 @@ import {
 import { debitProgrammIdToCardCodesMap } from './utils';
 
 type getDebitFormTaskDataProps = {
-  participantId: number;
+  participantId: string | number;
   taskId: number;
   formData: LeadFormState;
   programId: string;

package/mobile/src/retail/adaptors/getCreditFormTaskData.ts

@@ -10,7 +10,7 @@ import { getFamilyStatusAndIncomeData } from './getFamilyStatusAndIncomeData';
 import { getPersonalInfoData } from './getPersonalInfoData';
 
 type getCreditFormTaskDataProps = {
-  participantId: Nullable<number>;
+  participantId: Nullable<string | number>;
   taskId: number;
   profileId: Nullable<number>;
   formData: LeadFormState;

package/mobile/src/retail/api/createDraftTask.ts

@@ -2,7 +2,7 @@ import { fetchRetailJSON } from './doRequest';
 
 export type CreateDraftTaskBody = {
   profileId?: number;
-  participantId?: number;
+  participantId?: string | number;
   programId: string;
 };
 

package/mobile/src/retail/api/createParticipant.ts

@@ -6,7 +6,8 @@ interface CreateParticipantType {
 }
 
 interface CreateParticipantResponseType {
-  participantId: number;
+  participantId: string;
+  userId?: string;
 }
 
 export const createParticipant = (body: CreateParticipantType) =>
@@ -14,4 +15,4 @@ export const createParticipant = (body: CreateParticipantType) =>
     '/public-data/createParticipant',
     'POST',
     body,
-  ).then((res) => res?.participantId || null);
+  ).then((res) => res || null);

package/mobile/src/retail/api/draftTasksKZO.ts

@@ -24,7 +24,8 @@ export type Task = {
   office?: {
     id: string;
   };
-  participants: Participant[];
+  participants?: Participant[];
+  participant?: Participant;
   paymentTypeCd?: PaymentType;
   taskSource?: string;
 };

package/mobile/src/retail/api/getLastTaskStatus.ts

@@ -1,7 +1,8 @@
 import { fetchRetailJSON } from './doRequest';
 
 type GetLastTaskStatusBody = {
-  profileId: number;
+  profileId?: string | number;
+  userId?: string | number;
   programId: string;
 };
 

package/mobile/src/retail/api/getUserTasks.ts

@@ -1,47 +1,7 @@
 import { fetchRetailJSON } from './doRequest';
+import { type GetUserTasksResponse } from './getUserTasksTypes';
 
-export enum EProductType {
-  CASH = 'CASH',
-  CARD = 'CARD',
-  DEBIT = 'DEBIT',
-}
-
-export type UserTask = {
-  classCard?: {
-    key: string;
-    value: string;
-  };
-  createdDate?: string;
-  creditPeriod?: number;
-  deliveryAddress?: string;
-  extId?: string;
-  id?: number;
-  loanAmount?: number;
-  officeAddress?: string;
-  programId?: number;
-  programName?: string;
-  statusCd?: {
-    key: string;
-    value: string;
-  };
-  statusDescription?: string;
-};
-
-type AllTasks = {
-  productTypeCd: {
-    key: EProductType;
-    value: string;
-  };
-  tasks: Array<UserTask>;
-};
-
-export type GetUserTasksResponse = {
-  allTasks?: Array<AllTasks>;
-  user?: {
-    name: string;
-    midname: string;
-  };
-};
+export { EProductType, type GetUserTasksResponse, type UserTask } from './getUserTasksTypes';
 
 export const getUserTasks = async (): Promise<GetUserTasksResponse | undefined> => {
   const res = await fetchRetailJSON<GetUserTasksResponse>('/user-data/getUserTasks', 'GET');

package/mobile/src/retail/api/getUserTasksCard.ts

@@ -0,0 +1,6 @@
+import { type GetUserTasksResponse } from './getUserTasksTypes';
+
+export const getUserTasksCard = async (): Promise<GetUserTasksResponse | undefined> => {
+  // TODO: Заглушка - бэкенд в разработке
+  return undefined;
+};

package/mobile/src/retail/api/getUserTasksCredit.ts

@@ -0,0 +1,8 @@
+import { fetchRetailJSON } from './doRequest';
+import { type GetUserTasksResponse } from './getUserTasksTypes';
+
+export const getUserTasksCredit = async (): Promise<GetUserTasksResponse | undefined> => {
+  const res = await fetchRetailJSON<GetUserTasksResponse>('/public-data/getUserTasksCredit', 'GET');
+
+  return res || undefined;
+};

package/mobile/src/retail/api/getUserTasksDebit.ts

@@ -0,0 +1,6 @@
+import { type GetUserTasksResponse } from './getUserTasksTypes';
+
+export const getUserTasksDebit = async (): Promise<GetUserTasksResponse | undefined> => {
+  // TODO: Заглушка - бэкенд в разработке
+  return undefined;
+};

package/mobile/src/retail/api/getUserTasksTypes.ts

@@ -0,0 +1,42 @@
+export enum EProductType {
+  CASH = 'CASH',
+  CARD = 'CARD',
+  DEBIT = 'DEBIT',
+}
+
+export type UserTask = {
+  classCard?: {
+    key: string;
+    value: string;
+  };
+  createdDate?: string;
+  creditPeriod?: number;
+  deliveryAddress?: string;
+  extId?: string;
+  id?: number;
+  loanAmount?: number;
+  officeAddress?: string;
+  programId?: number;
+  programName?: string;
+  statusCd?: {
+    key: string;
+    value: string;
+  };
+  statusDescription?: string;
+};
+
+export type AllTasks = {
+  productTypeCd: {
+    key: EProductType;
+    value: string;
+  };
+  tasks: Array<UserTask>;
+};
+
+export type GetUserTasksResponse = {
+  allTasks?: Array<AllTasks>;
+  user?: {
+    name: string;
+    midname: string;
+  };
+};

package/mobile/src/retail/api/updateUserTask.ts

@@ -48,7 +48,7 @@ export type PaymentType = {
 
 export type Participant = {
   birthDate?: string;
-  id?: Nullable<number>;
+  id?: Nullable<string | number>;
   midname?: string;
   name?: string;
   surname?: string;

package/mobile/src/retail/components/ConsentBkiDialog/useConsentBkiDialog.tsx

@@ -7,9 +7,10 @@ import { ConsentBkiDialog } from './ConsentBkiDialog';
 type SubmitBkiConsentProps = {
   phone?: string;
   profileId?: number;
+  userId?: string | number;
   onFail?: () => void;
   taskId?: number;
-  participantId?: number;
+  participantId?: string | number;
 };
 
 export const useConsentBkiDialog = (onClose: () => void) => {
@@ -17,7 +18,8 @@ export const useConsentBkiDialog = (onClose: () => void) => {
   const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
 
   const handleSuccessVerify =
-    (profileId?: number, taskId?: number, participantId?: number) => async (smsCode?: string) => {
+    (profileId?: number, taskId?: number, participantId?: string | number) =>
+    async (smsCode?: string) => {
       try {
         if (profileId) {
           await updateUserProfile({
@@ -64,11 +66,12 @@ export const useConsentBkiDialog = (onClose: () => void) => {
     };
 
   return {
-    open: ({ phone, profileId, onFail, taskId, participantId }: SubmitBkiConsentProps) =>
+    open: ({ phone, profileId, userId, onFail, taskId, participantId }: SubmitBkiConsentProps) =>
       open({
         onSubmit: handleSubmitBkiConsent({
           phone,
           profileId,
+          userId,
           onFail,
           taskId,
           participantId,

package/mobile/src/retail/components/DraftDialog/DraftDialog.tsx

@@ -17,7 +17,7 @@ export interface DraftDialogProps extends OnCloseProps {
   task: Task;
   isFromLead?: boolean;
   isDebit?: boolean;
-  sendAspects?: (profileId: number, taskId: number) => void;
+  sendAspects?: (userId: number, taskId: number) => void;
 }
 
 export const DraftDialog = JSX<DraftDialogProps>(function ({
@@ -30,19 +30,21 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
   const retailFormStore = useRetailFormStore();
   const navigator = locationNavigator();
 
-  const { participants, creditProgram, createdDate = '', id: taskId } = task;
+  const { participants, participant, creditProgram, createdDate = '', id: taskId } = task;
 
   const programmId: string = creditProgramCodeToProductIdMap[creditProgram.code];
   const isCredit = Boolean(creditCodesToProgrammIdMap[creditProgram.code]);
   const productData = getProductData(isDebit, isCredit);
 
-  const { id: participantId, profile } = participants[0];
+  const currentParticipant = participant || participants?.[0];
+  const { id: participantId, profile } = currentParticipant || {};
 
   const handleGoToDraft = useCallback(() => {
     const taskFromDraft = parseDraftTask(task);
     retailFormStore.participantId = participantId ?? null;
     retailFormStore.taskId = taskId;
     retailFormStore.profileId = profile?.id ?? null;
+    retailFormStore.userId = profile?.id ?? null;
     retailFormStore.programId = programmId;
     retailFormStore.leadForm = taskFromDraft;
 

package/mobile/src/retail/components/DraftDialog/parseDraftTask.ts

@@ -11,7 +11,11 @@ import {
 } from './utils';
 
 export const parseDraftTask = (task: Task): LeadFormState => {
-  const participant = task.participants[0];
+  const participant = task.participant || task.participants?.[0];
+  if (!participant) {
+    throw new Error('Task does not contain participant data');
+  }
+
   const {
     classCard: cardCategory,
     codeWord,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.1028",
+  "version": "0.14.1029",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationLeadForm/getLeadFormTaskData.ts

@@ -12,7 +12,7 @@ import { type Nullable } from '../../utils/Nullable';
 import { debitProgrammIdToCardCodesMap } from '../DebitForm/utils';
 
 type getCreditLeadFormTaskDataProps = {
-  participantId: number;
+  participantId: string | number;
   taskId: number;
   profileId?: number;
   formData: LeadFormState;
@@ -28,7 +28,7 @@ type getDebitLeadFormTaskDataProps = {
 };
 
 type getParticipantProps = {
-  participantId: number;
+  participantId: number | string;
   profileId?: number;
   formData: LeadFormState;
   consents?: FormRetailConsents;

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -62,6 +62,7 @@ export const useApplicationLeadApi = ({
   const consentBkiDialog = useConsentBkiDialog(goToNextStep);
   const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
   const draftDialog = useDraftDialog();
+
   const handleFailSendForm = () => {
     verifyPhoneDialog.close();
     changeSubmitFormStatus(false);
@@ -145,7 +146,7 @@ export const useApplicationLeadApi = ({
     try {
       startSending();
       const transformedFormData = transformFormData(formData);
-      const participantId = await createParticipant({
+      const participantData = await createParticipant({
         phone: formatPhone(transformedFormData.phone as string),
         email: transformedFormData.email as string,
       });
@@ -153,38 +154,41 @@ export const useApplicationLeadApi = ({
       const referalData = leadFormStore.referalData;
       const marketingInfo = sessionStore.marketingInfo;
 
-      if (!participantId) {
+      if (!participantData) {
         throw new Error();
       }
 
-      const sendCurrentTask = async () => {
-        const taskId = await updateUserDataNewMicroservice({
-          programId,
-          participantId,
-          formData: transformedFormData,
-          referalData,
-          productType,
-          marketingInfo,
-          saveUserData,
-          sendAspects,
-        });
-        verifyPhoneDialog.close();
+      const { participantId, userId } = participantData;
 
-        consentBkiDialog.open({
-          phone: transformedFormData.phone,
-          taskId,
-          participantId,
-          onFail: handleFailSendForm,
-        });
-      };
+      if (!participantId) {
+        throw new Error();
+      }
 
-      const handleSuccessVerify = async () => {
-        try {
-          await sendCurrentTask();
-        } catch {
-          handleFailSendForm();
-        }
-      };
+      const sendCurrentTask = createSendCurrentTaskNew({
+        programId,
+        participantId,
+        userId,
+        formData: transformedFormData,
+        referalData,
+        productType,
+        marketingInfo,
+        saveUserData,
+        sendAspects,
+        verifyPhoneDialog,
+        consentBkiDialog,
+        handleFailSendForm,
+      });
+
+      const handleSuccessVerify = createHandleSuccessVerifyNew({
+        userId,
+        programId,
+        productType,
+        verifyPhoneDialog,
+        draftDialog,
+        sendAspects,
+        sendCurrentTask,
+        handleFailSendForm,
+      });
 
       const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
 
@@ -207,6 +211,108 @@ export const useApplicationLeadApi = ({
   };
 };
 
+const createSendCurrentTaskNew =
+  ({
+    programId,
+    participantId,
+    userId,
+    formData,
+    referalData,
+    productType,
+    marketingInfo,
+    saveUserData,
+    sendAspects,
+    verifyPhoneDialog,
+    consentBkiDialog,
+    handleFailSendForm,
+  }: {
+    programId: string;
+    participantId: string | number;
+    userId?: string | number;
+    formData: LeadFormState;
+    referalData: ReferalData | null;
+    productType: ProductType;
+    marketingInfo: MarketingInfo | null;
+    saveUserData: (userData: UserData) => void;
+    sendAspects: (userId: string | number, taskId: number) => void;
+    verifyPhoneDialog: any;
+    consentBkiDialog: any;
+    handleFailSendForm: () => void;
+  }) =>
+  async () => {
+    const taskId = await updateUserDataNewMicroservice({
+      programId,
+      participantId,
+      userId,
+      formData,
+      referalData,
+      productType,
+      marketingInfo,
+      saveUserData,
+      sendAspects,
+    });
+    verifyPhoneDialog.close();
+
+    consentBkiDialog.open({
+      phone: formData.phone,
+      taskId,
+      userId,
+      participantId,
+      onFail: handleFailSendForm,
+    });
+  };
+
+const createHandleSuccessVerifyNew =
+  ({
+    userId,
+    programId,
+    productType,
+    verifyPhoneDialog,
+    draftDialog,
+    sendAspects,
+    sendCurrentTask,
+    handleFailSendForm,
+  }: {
+    userId?: string | number;
+    programId: string;
+    productType: ProductType;
+    verifyPhoneDialog: any;
+    draftDialog: any;
+    sendAspects: (userId: string | number, taskId: number) => void;
+    sendCurrentTask: () => Promise<void>;
+    handleFailSendForm: () => void;
+  }) =>
+  async () => {
+    try {
+      const lastTaskId = await getLastTaskStatus({
+        userId,
+        profileId: userId,
+        programId,
+      });
+
+      if (lastTaskId) {
+        const task = await getTaskById({ taskId: lastTaskId });
+
+        if (task) {
+          verifyPhoneDialog.close();
+          draftDialog.open({
+            task,
+            isFromLead: true,
+            isDebit: productType === 'debitCard',
+            sendAspects,
+            onClose: sendCurrentTask,
+          });
+
+          return;
+        }
+      }
+
+      await sendCurrentTask();
+    } catch {
+      handleFailSendForm();
+    }
+  };
+
 const getAcceptedConsents = (formData: LeadFormState, productType: ProductType): string[] => {
   const consents = productTypeToConsentsMap[productType];
 
@@ -288,6 +394,7 @@ const updateUserData = async ({
 
 const updateUserDataNewMicroservice = async ({
   programId,
+  userId,
   participantId,
   formData,
   referalData,
@@ -297,13 +404,14 @@ const updateUserDataNewMicroservice = async ({
   sendAspects,
 }: {
   programId: string;
-  participantId: number;
+  participantId: string | number;
+  userId?: string | number;
   formData: LeadFormState;
   referalData: ReferalData | null;
   productType: ProductType;
   marketingInfo: MarketingInfo | null;
   saveUserData: (userData: UserData) => void;
-  sendAspects: (profileId: number, taskId: number) => void;
+  sendAspects: (userId: string | number, taskId: number) => void;
 }): Promise<number> => {
   let taskId: number;
   const transformedConsents = transformConsentsFields(formData, productType);
@@ -332,8 +440,8 @@ const updateUserDataNewMicroservice = async ({
       });
     }
 
-    sendAspects(participantId, taskId);
-    saveUserData({ participantId, taskId, programId, formData });
+    sendAspects(userId || participantId, taskId);
+    saveUserData({ participantId, taskId, userId, programId, formData });
 
     return taskId;
   } catch (ex) {

package/src/components/ApplicationLeadForm/useLeadFormStore.ts

@@ -8,7 +8,8 @@ export interface LeadFormStoreSlice {
   leadForm: LeadFormState;
   taskId: number;
   profileId: Nullable<number>;
-  participantId: number;
+  userId: Nullable<string | number>;
+  participantId: string | number;
   programId: string;
   productType: ProductType;
   referalData: ReferalData;

package/src/components/ApplicationLeadForm/useSaveUserData.ts

@@ -4,9 +4,10 @@ import { type Nullable } from '../../utils/Nullable';
 import { useLeadFormStore } from './useLeadFormStore';
 
 export interface UserData {
-  participantId: number;
+  participantId: string | number;
   taskId: number;
   profileId?: Nullable<number>;
+  userId?: Nullable<string | number>;
   programId: string;
   formData: LeadFormState;
 }
@@ -14,10 +15,18 @@ export const useSaveUserData = () => {
   const leadFormStore = useLeadFormStore();
 
   return useCallback(
-    ({ participantId, taskId, profileId, programId: programNumber, formData }: UserData) => {
+    ({
+      participantId,
+      taskId,
+      userId,
+      profileId,
+      programId: programNumber,
+      formData,
+    }: UserData) => {
       leadFormStore.participantId = participantId;
       leadFormStore.taskId = taskId;
       leadFormStore.profileId = profileId;
+      leadFormStore.userId = userId;
       leadFormStore.programId = programNumber;
       leadFormStore.leadForm = formData;
     },

package/src/components/ApplicationLeadForm/useSendLeadFormAspects.tsx

@@ -9,7 +9,7 @@ export const useSendLeadFormAspects = ({ data }: AspectsProps) => {
   const aspects = useAspects();
 
   return useCallback(
-    (ProfileId: number, TaskId: number) => {
+    (ProfileId: string | number, TaskId: number) => {
       const snowplowParams = JSON.stringify({
         ProfileId,
         TaskId,

package/src/components/CreditCardForm/getCreditCardFormTaskData.ts

@@ -12,7 +12,7 @@ import {
 } from './getDeliveryCreditCardData';
 
 type getCreditCardFormTaskDataProps = {
-  participantId: number;
+  participantId: string | number;
   taskId: number;
   profileId: number;
   formData: LeadFormState;

package/src/components/DebitForm/getDebitCardFormTaskData.ts

@@ -12,7 +12,7 @@ import {
 import { debitProgrammIdToCardCodesMap } from './utils';
 
 type getDebitFormTaskDataProps = {
-  participantId: number;
+  participantId: string | number;
   taskId: number;
   formData: LeadFormState;
   programId: string;