Filing process routing - Phase 2 (Live data)

src/api/requests/fetchSubmissionLatest.tsx

@@ -0,0 +1,18 @@
+import { request } from 'api/axiosService';
+import type { SblAuthProperties } from 'api/useSblAuth';
+import type { FilingPeriodType, SubmissionResponse } from 'types/filingTypes';
+import type { InstitutionDetailsApiType } from 'types/formTypes';
+
+export const fetchSubmissionLatest = async (
+  auth: SblAuthProperties,
+  lei: InstitutionDetailsApiType['lei'],
+  filingPeriod: FilingPeriodType,
+): Promise<SubmissionResponse> => {
+  return request({
+    url: `/v1/filing/institutions/${lei}/filings/${filingPeriod}/submissions/latest`,
+    method: 'get',
+    headers: { Authorization: `Bearer ${auth.user?.access_token}` },
+  });
+};
+
+export default fetchSubmissionLatest;

src/api/requests/index.ts

@@ -4,6 +4,7 @@ export { default as fetchFiling } from './fetchFiling';
 export { default as fetchInstitutionDetails } from './fetchInstitutionDetails';
 export { default as fetchInstitutions } from './fetchInstitutions';
 export { default as fetchIsDomainAllowed } from './fetchIsDomainAllowed';
+export { default as fetchSubmissionLatest } from './fetchSubmissionLatest';
 export { default as fetchUserProfile } from './fetchUserProfile';
 export { default as submitUpdateFinancialProfile } from './submitUpdateFinancialProfile';
 export { default as submitUserProfile } from './submitUserProfile';

src/utils/useFilingAndSubmissionInfo.tsx

@@ -1,22 +1,23 @@
 import type { UseQueryResult } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
-import { createFiling, fetchFiling } from 'api/requests';
+import { createFiling, fetchFiling, fetchSubmissionLatest } from 'api/requests';
 import useSblAuth from 'api/useSblAuth';
 import type { InstitutionDataType } from 'pages/Filing/FilingApp/InstitutionCard.types';
 import type { FilingType, SubmissionResponse } from 'types/filingTypes';
-import useGetSubmissionLatest from './useGetSubmissionLatest';
 
 // We want these queries to consistently update in order to keep the data in sync with the backend
 // TODO: Would be more efficient to use the refetch functions, but need to determine when/where to call them
 const staleTime = 0;
 
-export interface CombinedInfoType {
-  error: UseQueryResult<FilingType | SubmissionResponse>['error'];
+interface CombinedDataType {
   filing: FilingType | string | undefined;
-  isLoading: boolean;
   submission: Partial<SubmissionResponse> | string | undefined;
-  refetchFiling?: () => Promise<FilingType>;
-  refetchSubmission?: () => Promise<SubmissionResponse>;
+}
+
+export interface CombinedInfoType extends CombinedDataType {
+  error: UseQueryResult<FilingType | SubmissionResponse>['error'];
+  isLoading: boolean;
+  refetch?: () => Promise<CombinedDataType>;
 }
 
 /*
@@ -26,7 +27,7 @@ export interface CombinedInfoType {
  * is not yet created.
  */
 const isObjectInitialized = (
-  data: FilingType | SubmissionResponse | string | undefined,
+  data: FilingType | Partial<SubmissionResponse> | string | undefined,
 ): boolean => !!data && data !== '';
 
 /*
@@ -39,34 +40,36 @@ export const useFilingAndSubmissionInfo = ({
 }: InstitutionDataType): CombinedInfoType => {
   const auth = useSblAuth();
 
-  const existingFiling = useQuery({
-    queryKey: [`fetch-filing`, lei, filingPeriod],
-    queryFn: async (): Promise<FilingType> => {
-      let filing = await fetchFiling(auth, lei, filingPeriod);
-      if (!isObjectInitialized(filing)) {
-        filing = await createFiling(auth, lei, filingPeriod);
+  const allData = useQuery({
+    queryKey: [`fetch-filing-submission`, lei, filingPeriod],
+    queryFn: async (): Promise<CombinedDataType> => {
+      let filingResult = await fetchFiling(auth, lei, filingPeriod);
+
+      if (!isObjectInitialized(filingResult)) {
+        filingResult = await createFiling(auth, lei, filingPeriod);
       }
-      return filing;
+
+      const submissionLatest = await fetchSubmissionLatest(
+        auth,
+        lei,
+        filingPeriod,
+      );
+
+      return { filing: filingResult, submission: submissionLatest };
     },
     staleTime,
   });
 
-  const latestSubmission = useGetSubmissionLatest(lei, filingPeriod);
-
-  const error = [existingFiling.error, latestSubmission.error].some(Boolean);
-
-  const isLoading = [existingFiling.isLoading, latestSubmission.isLoading].some(
-    Boolean,
-  );
+  const { error, isLoading, data, refetch } = allData;
+  const { filing, submission } = data ?? {};
 
   return {
     error,
-    filing: existingFiling,
+    filing,
     isLoading,
-    submission: isObjectInitialized(latestSubmission.data)
-      ? latestSubmission.data
-      : { state: 'SUBMISSION_STARTED', refetch: latestSubmission.refetch },
-    refetchFiling: existingFiling.refetch,
-    refetchSubmission: latestSubmission.refetch,
+    submission: isObjectInitialized(submission)
+      ? submission
+      : { state: 'SUBMISSION_STARTED', refetch },
+    refetch,
   };
 };