NC-4886: Update namiCampaignManager.refresh

namiml · Jul 3, 2024 · 0da1ac8 · 0da1ac8
1 parent 11b8f3a
commit 0da1ac8
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 14 deletions.
diff --git a/android/src/main/java/com/nami/reactlibrary/NamiCampaignManagerBridge.kt b/android/src/main/java/com/nami/reactlibrary/NamiCampaignManagerBridge.kt
@@ -226,8 +226,14 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun refresh() {
-        NamiCampaignManager.refresh() { }
+     fun refresh(promise: Promise) {
+        NamiCampaignManager.refresh { campaigns ->
+            val array = WritableNativeArray()
+            campaigns?.forEach { campaign ->
+                array.pushMap(campaignToReadableMap(campaign))
+            }
+            promise.resolve(array)
+        }    
     }
 
     @ReactMethod

diff --git a/examples/Basic/containers/CampaignScreen.tsx b/examples/Basic/containers/CampaignScreen.tsx
@@ -89,6 +89,15 @@ const CampaignScreen: FC<CampaignScreenProps> = ({ navigation }) => {
     return validCampaigns;
   }, []);
 
+  const getRefreshedCampaigns = useCallback(async () => {
+    const fetchedCampaigns = await NamiCampaignManager.refresh();
+    const refreshedCampaigns = fetchedCampaigns.filter((campaign) =>
+      Boolean(campaign.value),
+    );
+    setCampaigns(refreshedCampaigns);
+    return refreshedCampaigns;
+  }, []);
+
   useEffect(() => {
     getAllCampaigns();
     const subscriptionSignInRemover = NamiPaywallManager.registerSignInHandler(
@@ -197,7 +206,7 @@ const CampaignScreen: FC<CampaignScreenProps> = ({ navigation }) => {
   const onRefreshPress = useCallback(() => {
     getAllCampaigns();
     setRefresh(!refresh);
-    NamiCampaignManager.refresh();
+    getRefreshedCampaigns();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -212,7 +221,7 @@ const CampaignScreen: FC<CampaignScreenProps> = ({ navigation }) => {
           onRefreshPress={() => {
             getAllCampaigns();
             setRefresh(!refresh);
-            NamiCampaignManager.refresh();
+            getRefreshedCampaigns();
           }}
         />
       ),

diff --git a/examples/Basic/package.json b/examples/Basic/package.json
@@ -27,11 +27,11 @@
     "react": "17.0.2",
     "react-native": "0.65.2",
     "react-native-gesture-handler": "^1.8.0",
+    "react-native-iap": "10.1.3",
     "react-native-nami-sdk": "file:../../",
     "react-native-reanimated": "^2.14.4",
     "react-native-safe-area-context": "^3.3.2",
-    "react-native-screens": "3.18.2",
-    "react-native-iap": "10.1.3"
+    "react-native-screens": "3.18.2"
   },
   "devDependencies": {
     "@babel/core": "^7.16.5",

diff --git a/examples/TestNamiTV/containers/CampaignScreen.tsx b/examples/TestNamiTV/containers/CampaignScreen.tsx
@@ -91,8 +91,12 @@ const CampaignScreen: FC<CampaignScreenProps> = ({ navigation }) => {
 
   const onItemPressDefault = useCallback(() => triggerLaunch(null, null), []);
 
-  const onRefreshPress = useCallback(() => {
-    NamiCampaignManager.refresh();
+  const onRefreshPress = useCallback(async () => {
+    const fetchedCampaigns = await NamiCampaignManager.refresh();
+    const refreshedCampaigns = fetchedCampaigns.filter(campaign =>
+      Boolean(campaign.value),
+    );
+    setCampaigns(refreshedCampaigns);
   }, []);
 
   useLayoutEffect(() => {

diff --git a/ios/NamiCampaignManagerBridge.m b/ios/NamiCampaignManagerBridge.m
@@ -15,7 +15,7 @@ @interface RCT_EXTERN_MODULE(RNNamiCampaignManager, NSObject)
 
 RCT_EXTERN_METHOD(isCampaignAvailable:(nullable NSString *)campaignSource resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(refresh)
+RCT_EXTERN_METHOD(refresh:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(registerAvailableCampaignsHandler)
 

diff --git a/ios/NamiCampaignManagerBridge.swift b/ios/NamiCampaignManagerBridge.swift
@@ -218,9 +218,12 @@ class RNNamiCampaignManager: RCTEventEmitter {
         resolve(isCampaignAvailable)
     }
 
-    @objc(refresh)
-    func refresh() {
-        NamiCampaignManager.refresh()
+    @objc(refresh:rejecter:)
+    func refresh(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
+        NamiCampaignManager.refresh { campaigns in
+            let dictionaries = campaigns.map { campaign in self.campaignInToDictionary(campaign) }
+            resolve(dictionaries)
+        } 
     }
 
     @objc(registerAvailableCampaignsHandler)

diff --git a/src/NamiCampaignManager.d.ts b/src/NamiCampaignManager.d.ts
@@ -11,7 +11,7 @@ interface ICampaignManager {
     allCampaigns: () => Promise<Array<NamiCampaign>>;
     isCampaignAvailable(campaignSource: string | null): Promise<boolean>;
     launch: (label?: string, withUrl?: string, context?: PaywallLaunchContext, resultCallback?: (success: boolean, error?: LaunchCampaignError) => void, actionCallback?: (action: NamiPaywallAction, campaignId: string, paywallId: string, campaignName?: string, campaignType?: string, campaignLabel?: string, campaignUrl?: string, paywallName?: string, segmentId?: string, externalSegmentId?: string, deeplinkUrl?: string, skuId?: string, componentChangeId?: string, componentChangeName?: string, purchaseError?: string, purchases?: NamiPurchase[]) => void) => void;
-    refresh: () => void;
+    refresh: () => Promise<Array<NamiCampaign>>;
     registerAvailableCampaignsHandler: (callback: (availableCampaigns: NamiCampaign[]) => void) => EmitterSubscription['remove'];
 }
 export declare const NamiCampaignManager: ICampaignManager;

diff --git a/src/NamiCampaignManager.ts b/src/NamiCampaignManager.ts
@@ -32,7 +32,7 @@ interface ICampaignManager {
     resultCallback?: (success: boolean, error?: LaunchCampaignError) => void,
     actionCallback?: NamiPaywallActionHandler,
   ) => void;
-  refresh: () => void;
+  refresh: () => Promise<Array<NamiCampaign>>;
   registerAvailableCampaignsHandler: (
     callback: (availableCampaigns: NamiCampaign[]) => void,
   ) => EmitterSubscription['remove'];