Merge branch 'PBI-8-payment_inapp_logic' into 'staging'

Add payment webview integration, fix auth logic

See merge request !53

.gitlab-ci.yml

@@ -39,6 +39,7 @@ test:
     - yarn install
     - yarn test --silent
   artifacts:
+    expire_in: 1 week
     paths:
       - coverage
 
@@ -84,9 +85,10 @@ android:
     - yarn install
     - export ANDROID_SDK_ROOT=/usr/lib/android-sdk
     - cd android
-    - chmod +x gradlew && ./gradlew assembleRelease
+    - chmod +x gradlew && ./gradlew clean && ./gradlew assembleRelease
     - cd .. && cp android/app/build/outputs/apk/release/app-release.apk $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME.apk
   artifacts:
+    expire_in: 1 week
     name: '$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME'
     paths:
       - $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME.apk

src/app/index.tsx

@@ -30,20 +30,18 @@ const NavigationStack: FC = () => {
       <Stack.Navigator
         initialRouteName={initialRoute}
         screenOptions={screenOptions}>
-        <>
-          {navigation.map((nav, i) => (
-            <Stack.Screen
-              key={`nav${i}`}
-              name={nav.name}
-              component={nav.component}
-              options={{
-                title: nav.header,
-                headerShown: Boolean(nav.header),
-                headerRight: LogoutButton,
-              }}
-            />
-          ))}
-        </>
+        {navigation.map((nav, i) => (
+          <Stack.Screen
+            key={`nav${i}`}
+            name={nav.name}
+            component={nav.component}
+            options={{
+              title: nav.header,
+              headerShown: Boolean(nav.header),
+              headerRight: LogoutButton,
+            }}
+          />
+        ))}
       </Stack.Navigator>
     </NavigationContainer>
   );

src/app/schema.ts

 import * as ROUTES from 'constants/routes';
 import {
   publicNavigation,
-  unpaidClientNavigation,
   clientNavigation,
   nutritionistNavigation,
 } from 'constants/navigation';
@@ -14,19 +13,20 @@ export const getNavigation = (
 ) => {
   if (isAuthenticated) {
     if (user.role === UserRole.CLIENT) {
-      if (user.transaction_status === TransactionStatus.UNPAID) {
-        return {
-          initialRoute: ROUTES.checkout,
-          navigation: unpaidClientNavigation,
-        };
+      let initialRoute = ROUTES.clientProfile;
+      if ([TransactionStatus.UNPAID, null].includes(user.transaction_status)) {
+        initialRoute = ROUTES.checkout;
+      } else if (user.transaction_status === TransactionStatus.PENDING) {
+        initialRoute = ROUTES.paymentResult;
+      } else if (!user.is_finished_onboarding) {
+        initialRoute = ROUTES.extendedQuestionnaire;
       }
       return {
-        initialRoute: user.is_finished_onboarding
-          ? ROUTES.clientProfile
-          : ROUTES.extendedQuestionnaire,
+        initialRoute,
         navigation: clientNavigation,
       };
     }
+
     if (user.role === UserRole.NUTRITIONIST) {
       return {
         initialRoute: ROUTES.clientListForNutritionist,
@@ -34,6 +34,7 @@ export const getNavigation = (
       };
     }
   }
+
   return {
     initialRoute: ROUTES.initial,
     navigation: publicNavigation,

src/constants/dietelaProgram.ts

@@ -10,10 +10,10 @@ import {
 } from './programDetail';
 
 const prices = {
-  oneWeek: '239,900',
-  oneMonth: '609,900',
-  threeMonths: '1,659,900',
-  sixMonths: '3,449,000',
+  oneWeek: '239.900',
+  oneMonth: '609.900',
+  threeMonths: '1.659.900',
+  sixMonths: '3.449.000',
 };
 
 export const dietPrograms = {

src/constants/navigation.ts

@@ -28,6 +28,7 @@ import {
   ComingSoonPage,
   ClientProfile,
   ClientProfileForAdmin,
+  PaymentWebView,
 } from 'scenes';
 import { FC } from 'react';
 
@@ -88,26 +89,22 @@ export const publicNavigation: NavRoute[] = [
   },
 ];
 
-export const unpaidClientNavigation: NavRoute[] = [
+export const clientNavigation: NavRoute[] = [
   {
     name: ROUTES.checkout,
     component: Checkout,
     header: 'Checkout',
   },
   {
-    name: ROUTES.paymentResult,
-    component: PaymentResult,
+    name: ROUTES.payment,
+    component: PaymentWebView,
     header: 'Pembayaran',
   },
-  ...navigation,
-];
-
-export const clientNavigation: NavRoute[] = [
   {
-    name: ROUTES.clientProfile,
-    component: ClientProfile,
-    header: 'Profil Saya',
+    name: ROUTES.paymentResult,
+    component: PaymentResult,
   },
+  ...navigation,
   {
     name: ROUTES.extendedQuestionnaire,
     component: ExtendedQuestionnaire,
@@ -142,6 +139,11 @@ export const clientNavigation: NavRoute[] = [
     ...nav,
     name: ROUTES.extendedQuestionnaireById(id),
   })),
+  {
+    name: ROUTES.clientProfile,
+    component: ClientProfile,
+    header: 'Profil Saya',
+  },
 ];
 
 export const nutritionistNavigation: NavRoute[] = [
@@ -176,7 +178,6 @@ export const adminNavigation: NavRoute[] = [
 ];
 
 export const testNavigation: NavRoute[] = [
-  ...navigation,
   ...clientNavigation,
   ...nutritionistNavigation,
   {
@@ -198,14 +199,4 @@ export const testNavigation: NavRoute[] = [
     component: NutritionistAdminLogin,
     header: 'Login Tim Dietela',
   },
-  {
-    name: ROUTES.checkout,
-    component: Checkout,
-    header: 'Checkout',
-  },
-  {
-    name: ROUTES.paymentResult,
-    component: PaymentResult,
-    header: 'Pembayaran',
-  },
 ];

src/constants/routes.ts

@@ -21,7 +21,7 @@ export const nutritionistAdminLogin = 'nutritionist-admin-login';
 const profile = 'profile';
 export const clientProfile = `${profile}/client`;
 
-const payment = 'payment';
+export const payment = 'payment';
 export const paymentResult = `${payment}/result`;
 
 const nutritionist = 'nutritionist';

src/hooks/index.ts

 export { default as useApi } from './useApi';
-export { default as useAuthEffect } from './useAuthEffect';
 export { default as useDownloadFiles } from './useDownloadFiles';
 export { default as useForm } from './useForm';
 export { default as useLinkingEffect } from './useLinkingEffect';
+export { default as useSignupEffect } from './useSignupEffect';

src/hooks/useAuthEffect/index.ts → src/hooks/useSignupEffect/index.ts

-import { useContext, useEffect, useCallback, useState } from 'react';
+import { useEffect, useCallback } from 'react';
 import { useNavigation } from '@react-navigation/native';
-import { UserContext } from 'provider';
 import * as ROUTES from 'constants/routes';
 import CACHE_KEYS from 'constants/cacheKeys';
 import { getCache } from 'utils/cache';
 
-const useAuthEffect = () => {
-  const { isFirstLoading } = useContext(UserContext);
+const useSignupEffect = () => {
   const navigation = useNavigation();
-  const [isLoading, setIsLoading] = useState(false);
 
   const checkCart = useCallback(async () => {
-    setIsLoading(true);
     const dietProfileId = await getCache(CACHE_KEYS.dietProfileId);
-    const cartId = await getCache(CACHE_KEYS.cartId);
     if (!dietProfileId) {
       navigation.reset({
         index: 0,
@@ -22,20 +17,12 @@ const useAuthEffect = () => {
           { name: ROUTES.allAccessQuestionnaire },
         ],
       });
-    } else if (!cartId) {
-      navigation.reset({
-        index: 0,
-        routes: [{ name: ROUTES.initial }, { name: ROUTES.choosePlan }],
-      });
     }
-    setIsLoading(false);
   }, [navigation]);
 
   useEffect(() => {
     checkCart();
   }, [checkCart]);
-
-  return isFirstLoading || isLoading;
 };
 
-export default useAuthEffect;
+export default useSignupEffect;

src/provider/UserContext/index.ts

@@ -21,14 +21,13 @@ import {
 import { setAuthHeader, resetAuthHeader } from 'services/api';
 
 import { iUserContext } from './types';
-import { TransactionStatus } from 'services/payment/models';
 
 export const initialUser = {
   id: null,
   email: '',
   name: '',
   role: null,
-  transaction_status: TransactionStatus.UNPAID,
+  transaction_status: null,
   is_finished_onboarding: false,
 };
 
@@ -53,8 +52,8 @@ export const useUserContext = (): iUserContext => {
     await GoogleSignin.signOut();
     await removeCache(CACHE_KEYS.authToken);
     await removeCache(CACHE_KEYS.refreshToken);
-    setUser(initialUser);
     resetAuthHeader();
+    setUser(initialUser);
   }, []);
 
   const getUser = useCallback(async () => {
@@ -81,8 +80,8 @@ export const useUserContext = (): iUserContext => {
     const accessToken = data.access_token;
     await setCache(CACHE_KEYS.authToken, accessToken);
     await setCache(CACHE_KEYS.refreshToken, data.refresh_token);
-    setUser(data.user);
     setAuthHeader(accessToken);
+    setUser(data.user);
   };
 
   const linkUserData = async (email: string) => {
@@ -104,8 +103,8 @@ export const useUserContext = (): iUserContext => {
   const signup = async (registerData: RegistrationRequest) => {
     const response = await signupApi(registerData);
     if (response.success && response.data) {
+      await linkUserData(response.data.user.email);
       await authSuccess(response.data);
-      return await linkUserData(response.data.user.email);
     }
     return response;
   };
@@ -127,8 +126,7 @@ export const useUserContext = (): iUserContext => {
         access_token: tokens.accessToken,
       });
       if (response.success && response.data) {
-        await authSuccess(response.data);
-
+        // If signup, link user to cart and diet profile
         if (!isLogin) {
           const linkResponse = await linkUserData(response.data.user.email);
           if (!linkResponse.success) {
@@ -140,6 +138,8 @@ export const useUserContext = (): iUserContext => {
             });
           }
         }
+
+        await authSuccess(response.data);
       } else {
         await logout();
       }

src/scenes/auth/ManualRegistrationPage/index.tsx

 import React, { FC, useContext } from 'react';
-import { useForm, useAuthEffect } from 'hooks';
+import { useForm, useSignupEffect } from 'hooks';
 import { ScrollView } from 'react-native-gesture-handler';
 import { useNavigation } from '@react-navigation/core';
 
-import { BigButton, Link, Toast, Loader } from 'components/core';
+import { BigButton, Link, Toast } from 'components/core';
 import { Section } from 'components/layout';
 import { TextField } from 'components/form';
 import { GoogleLoginButton } from '../components';
@@ -50,11 +50,8 @@ const ManualRegistrationPage: FC = () => {
 
   const signupWithGoogle = () => loginWithGoogle(false);
 
-  const isProcessing = useAuthEffect();
+  useSignupEffect();
 
-  if (isProcessing) {
-    return <Loader />;
-  }
   return (
     <ScrollView contentContainerStyle={layoutStyles}>
       {textField.map((fieldProps, i) => (

src/scenes/cart/Checkout/index.test.tsx

 import React from 'react';
-import { render, waitFor, fireEvent } from 'utils/testing';
+import { render, waitFor, fireEvent } from '@testing-library/react-native';
 import axios from 'axios';
 
 import Checkout from '.';
 
-import * as ROUTES from 'constants/routes';
 import CACHE_KEYS from 'constants/cacheKeys';
 import { DietelaProgram } from 'services/dietelaQuiz/quizResult';
 import { setCache } from 'utils/cache';
 import { mockProgramRecommendations } from '__mocks__/quizResult';
-import { Linking } from 'react-native';
 
 jest.mock('axios');
 const mockAxios = axios as jest.Mocked<typeof axios>;
 
+const mockedNavigate = jest.fn();
+
+jest.mock('@react-navigation/native', () => {
+  return {
+    useNavigation: () => ({
+      navigate: mockedNavigate,
+      reset: mockedNavigate,
+    }),
+  };
+});
+
 describe('Checkout', () => {
   const nutritionist = {
     id: 1,
@@ -38,18 +47,11 @@ describe('Checkout', () => {
       },
     });
 
-  const userContextMock = {
-    isAuthenticated: true,
-    isUnpaidClient: true,
-  };
-
   it('redirects to program detail page when user clicks Baca selengkapnya button for program', async () => {
     await setCache(CACHE_KEYS.cartId, 1);
     mockAxios.request.mockImplementationOnce(retrieveCartApi);
 
-    const { getAllByText, getByText } = render(<Checkout />, ROUTES.checkout, {
-      userContext: userContextMock,
-    });
+    const { getAllByText, getByText } = render(<Checkout />);
     await waitFor(() => expect(mockAxios.request).toBeCalled());
 
     const chosenProgram = getByText(/One Week Trial/i);
@@ -59,16 +61,13 @@ describe('Checkout', () => {
     expect(readMoreButton).toBeTruthy();
     fireEvent.press(readMoreButton);
 
-    const programDetailPage = getByText(/Program Dietela/i);
-    expect(programDetailPage).toBeTruthy();
+    expect(mockedNavigate).toHaveBeenCalled();
   });
 
   it('redirects to nutritionist detail page when user clicks Baca selengkapnya button for nutritionist', async () => {
     mockAxios.request.mockImplementationOnce(retrieveCartApi);
 
-    const { getAllByText, getByText } = render(<Checkout />, ROUTES.checkout, {
-      userContext: userContextMock,
-    });
+    const { getAllByText, getByText } = render(<Checkout />);
     await waitFor(() => expect(mockAxios.request).toBeCalled());
 
     const chosenNutritionist = getByText(/Wendy/i);
@@ -77,6 +76,8 @@ describe('Checkout', () => {
     const readMoreButton = getAllByText(/Baca selengkapnya/i)[1];
     expect(readMoreButton).toBeTruthy();
     fireEvent.press(readMoreButton);
+
+    expect(mockedNavigate).toHaveBeenCalled();
   });
 
   it('redirects to choose plan page when user clicks Ganti Pilihan button', async () => {
@@ -86,25 +87,20 @@ describe('Checkout', () => {
     );
     mockAxios.request.mockImplementationOnce(retrieveCartApi);