Merge pull request #163 from yssk22/revert-159-develop

Revert "[expo] implement push notification handler"

expo/features/app/user/internals/UserRoot.tsx

@@ -1,17 +1,12 @@
 import { useCurrentUser, useUserConfig } from '@hpapp/features/app/settings';
 import { Initializer, Loading } from '@hpapp/features/common';
 import { Screen, ScreenParams, createStackNavigator } from '@hpapp/features/common/stack';
-import {
-  usePushNotificationToken,
-  usePushNotificationTokenUpdator,
-  PushNotificationData,
-  PushNotificationHandler
-} from '@hpapp/features/push';
+import { usePushNotificationToken, usePushNotificationTokenUpdator } from '@hpapp/features/push';
 import { logScreenView, useSetUserId } from '@hpapp/system/firebase';
 import * as logging from '@hpapp/system/logging';
 import { init as initURICache } from '@hpapp/system/uricache';
 import { useNavigationContainerRef } from '@react-navigation/native';
-import { useCallback, useEffect } from 'react';
+import { useEffect } from 'react';
 
 import UserError from './UserError';
 import UserServiceProvider from './UserServiceProvider';
@@ -24,16 +19,11 @@ const Stack = createStackNavigator({
 const initializers = [initURICache];
 const Screens: Screen<ScreenParams>[] = [];
 
-// TODO: genscreen should create this param types as well.
-type PushNotificationParams = {
-  '/feed/item/': { feedId: string };
-};
-
 export type UserRootProps = { screens?: Screen<ScreenParams>[] };
 
 export default function UserRoot({ screens = Screens }: UserRootProps) {
   const userConfig = useUserConfig();
-  const navigation = useNavigationContainerRef<PushNotificationParams>();
+  const navigation = useNavigationContainerRef<ReactNavigation.RootParamList>();
   const token = usePushNotificationToken();
   const [tokenUpdator] = usePushNotificationTokenUpdator();
   useEffect(() => {
@@ -43,52 +33,22 @@ export default function UserRoot({ screens = Screens }: UserRootProps) {
   }, [token.data]);
   const currentUser = useCurrentUser();
   useSetUserId(currentUser?.id ?? null);
-  const onData = useCallback((data: PushNotificationData) => {
-    // TODO: if navigation is not ready, we should wait for it, and navigate after it's ready.
-    const nav = navigation?.current;
-    if (nav === null) {
-      return;
-    }
-    if (!nav.isReady()) {
-      return;
-    }
-
-    // we need a compatibility of payload with v2 implementation
-    // == Ameblo Notification payload example
-    // {
-    //   "params": {
-    //     "id": 94489510263,
-    //     "memberKey": "yukiho_shimoitani",
-    //     "path": "/angerme-new/entry-12876844045.html",
-    //     "post_id": 12889971534
-    //   },
-    //   "path": "/ameblo/post/"
-    // }
-    if (data.body.payload.path === '/ameblo/post/') {
-      nav.navigate('/feed/item/', { feedId: data.body.payload.params.id });
-      return;
-    }
-    // in v3, the server should send path and params so that we don't have to handle details.
-    nav.navigate(data.body.payload.path, data.body.payload.params);
-  }, []);
   return (
     <Initializer initializers={initializers}>
       <UserServiceProvider errorFallback={UserError} loadingFallback={<Loading testID="UserRoot.Loading" />}>
-        <PushNotificationHandler onData={onData}>
-          <Stack
-            ref={navigation}
-            screens={screens}
-            initialRouteName={userConfig?.completeOnboarding ? '/' : '/onboarding/'}
-            onStateChange={(state) => {
-              logScreenView(state.screen.name);
-              logging.Info('features.app.user.onStateChagne', `to ${state.screen.name}`, {
-                name: state.screen.name,
-                path: state.screen.path,
-                params: state.params
-              });
-            }}
-          />
-        </PushNotificationHandler>
+        <Stack
+          ref={navigation}
+          screens={screens}
+          initialRouteName={userConfig?.completeOnboarding ? '/' : '/onboarding/'}
+          onStateChange={(state) => {
+            logScreenView(state.screen.name);
+            logging.Info('features.app.user.onStateChagne', `to ${state.screen.name}`, {
+              name: state.screen.name,
+              path: state.screen.path,
+              params: state.params
+            });
+          }}
+        />
       </UserServiceProvider>
     </Initializer>
   );

expo/features/devtool/DevtoolScreen.tsx

@@ -4,7 +4,6 @@ import { useThemeColor } from '@hpapp/features/app/theme';
 import { AuthGateByRole } from '@hpapp/features/auth';
 import { Text } from '@hpapp/features/common';
 import { defineScreen } from '@hpapp/features/common/stack';
-import { usePushNotificationToken } from '@hpapp/features/push';
 import { getAppCheckToken } from '@hpapp/system/firebase';
 import { t } from '@hpapp/system/i18n';
 import { Divider, ListItem } from '@rneui/themed';
@@ -20,8 +19,6 @@ export default defineScreen('/devtool/', function DevtoolScreen() {
   const appConfig = useAppConfig();
   const userConfig = useUserConfig();
   const [appCheckToken, setAppCheckToken] = useState<string | null>(null);
-  const pushToken = usePushNotificationToken();
-
   useEffect(() => {
     (async () => {
       setAppCheckToken((await getAppCheckToken()).token);
@@ -52,15 +49,6 @@ export default defineScreen('/devtool/', function DevtoolScreen() {
         displayValue={(appCheckToken ?? '').substring(0, 20) + '****'}
       />
       <Divider />
-      <DevtoolListItem
-        name="Push Token"
-        value={pushToken.error !== undefined ? pushToken.error.toString() : (pushToken.data ?? '')}
-        displayValue={
-          pushToken.error !== undefined ? pushToken.error.toString() : (pushToken.data ?? '').substring(0, 20) + '****'
-        }
-      />
-      <Divider />
-
       <ListItemClearCache />
       <Divider />
       <DevtoolUserConfigForm />

expo/features/feed/FeedItemScreen.tsx

@@ -9,7 +9,7 @@ export type FeedItemScreenProps = {
   feedId: string;
 };
 
-export default defineScreen('/feed/item/', function FeedItemScreen(props: FeedItemScreenProps) {
+export default defineScreen('/feed/', function FeedItemScreen(props: FeedItemScreenProps) {
   return (
     <View style={styles.container}>
       <Suspense fallback={<Loading />}>

expo/features/push/index.tsx

@@ -1,4 +1,4 @@
-import PushNotificationHandler, { PushNotificationData } from './internals/PushNotificationHandler';
 import usePushNotificationToken from './internals/usePushNotificationToken';
 import usePushNotificationTokenUpdator from './internals/usePushNotificationTokenUpdator';
-export { usePushNotificationToken, usePushNotificationTokenUpdator, PushNotificationHandler, PushNotificationData };
+
+export { usePushNotificationToken, usePushNotificationTokenUpdator };

expo/jest.setup.tsx

@@ -218,5 +218,4 @@ jest.mock('@hpapp/features/app/storybook', () => {
     }
   };
 });
-
 jest.setTimeout(30000);

go/service/push/notification.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/yssk22/hpapp/go/foundation/slice"
 	"github.com/yssk22/hpapp/go/service/ent"
-	"github.com/yssk22/hpapp/go/service/ent/usernotificationlog"
 	"github.com/yssk22/hpapp/go/service/ent/usernotificationsetting"
 	"github.com/yssk22/hpapp/go/service/entutil"
 	"github.com/yssk22/hpapp/go/service/schema/enums"
@@ -134,28 +133,20 @@ func Deliver(ctx context.Context, notif Notification, options ...DeliveryOption)
 	fmt.Println(receivers)
 
 	entclient := entutil.NewClient(ctx)
-	isTest := len(o.TestTokens) > 0
 	record, err := entclient.UserNotificationLog.Create().
 		SetKey(key).
 		SetTrigger(trigger).
 		SetReactNavigationMessage(*message).
-		SetIsTest(isTest).
+		SetIsTest(len(o.TestTokens) > 0).
 		SetStatus(enums.UserNotificationStatusPrepared).
 		SetExpectedDeliveryTime(expectedTime).
 		AddReceivers(receivers...).
 		Save(ctx)
 	if err != nil {
-		if !ent.IsConstraintError(err) {
-			return nil, err
-		}
-		// ignore duplicate notification if it's test
-		if !isTest {
+		if ent.IsConstraintError(err) {
 			return nil, ErrDuplicateNotification
 		}
-		record, err = entclient.UserNotificationLog.Query().Where(usernotificationlog.KeyEQ(key), usernotificationlog.TriggerEQ(trigger)).WithReceivers().First(ctx)
-		if err != nil {
-			return nil, err
-		}
+		return nil, err
 	}
 	messages, err := buildPushMessage(ctx, record)
 	var status enums.UserNotificationStatus