embulk-input-facebook_ads_insights 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 216c608f834dd00d357b5065f346317c1ab0e23b
-  data.tar.gz: e3c360c8ef84d04c4e4119bba18d7124781f955f
+  metadata.gz: d46e96da39a17161b5c84ce1e0f47b984d170311
+  data.tar.gz: 5e3558265b4c7201478eb70ab96bcc5ecfc8f467
 SHA512:
-  metadata.gz: dcfd7142941bc480c15372b6efa2f297dccbbe6788e762b79598ea6d63bf7d5e3699e6c4c3deeef8ea161fed1b8f54eb4e1cb4ef44ac68fa9589bdff6955028d
-  data.tar.gz: ccfc9c175adde3185f571fe9404b6e313ceb7bed174a5aa0d7d94721a7c12766c7e6ced0c00fc4ed2652bab413921b33f83441c4b83bf26a9c4572b55a999bc9
+  metadata.gz: fe9dca2e749a6f6f94adb57aaf1d788663e10a4c3a31ee9323452c6d2628f846cc212b3f8de96ee0916e7f8c463e8ea91f13f6e2e1d6433df9d21056ae46cee7
+  data.tar.gz: 83f87b360a4949455f323e9d949790c0a45077bb37ac70977db477343b9b78fec9ac528d97df328091f0341e23bdd31bccf48c2a595e7840b7e8a4bb2f06dc4c

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.2"
+version = "0.1.3"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

data/src/main/java/org/embulk/input/facebook_ads_insights/Client.java

@@ -16,6 +16,7 @@ import org.embulk.spi.ColumnConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -31,7 +32,7 @@ public class Client
         this.pluginTask = pluginTask;
     }
 
-    public APINodeList<AdsInsights> getInsights() throws APIException, InterruptedException
+    public List<AdsInsights> getInsights(boolean isPaginationValid) throws APIException, InterruptedException
     {
         AdReportRun adReportRun;
         switch (pluginTask.getObjectType()) {
@@ -56,7 +57,8 @@ public class Client
         while (adReportRun.fetch().getFieldAsyncPercentCompletion() != 100) {
             Thread.sleep(ASYNC_SLEEP_TIME);
         }
-        return adReportRun.getInsights().execute();
+        APINodeList<AdsInsights> adsInsights = adReportRun.getInsights().execute();
+        return isPaginationValid ? fetchAllPage(adsInsights) : adsInsights;
     }
 
     // TODO: plz make me dry
@@ -244,6 +246,17 @@ public class Client
         return request.execute();
     }
 
+    private List<AdsInsights> fetchAllPage(APINodeList<AdsInsights> adsInsights) throws APIException
+    {
+        List<AdsInsights> result = new ArrayList<>();
+        APINodeList<AdsInsights> next = adsInsights;
+        while (!next.isEmpty()) {
+            result.addAll(next);
+            next = next.nextPage();
+        }
+        return result;
+    }
+
     private APIContext apiContext()
     {
         return new APIContext(pluginTask.getAccessToken());

data/src/main/java/org/embulk/input/facebook_ads_insights/FacebookAdsInsightsInputPlugin.java

@@ -56,7 +56,7 @@ public class FacebookAdsInsightsInputPlugin
         try {
             try (PageBuilder pageBuilder = new PageBuilder(Exec.getBufferAllocator(), schema, output)) {
                 Client client = new Client(task);
-                List<AdsInsights> insights = client.getInsights();
+                List<AdsInsights> insights = client.getInsights(!Exec.isPreview());
                 for (AdsInsights insight : insights) {
                     schema.visitColumns(new FacebookAdsInsightsColumnVisitor(insight, pageBuilder, task));
                     pageBuilder.addRecord();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-facebook_ads_insights
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - naotaka nakane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ files:
 - README.md
 - build.gradle
 - classpath/annotations-13.0.jar
-- classpath/embulk-input-facebook_ads_insights-0.1.2.jar
+- classpath/embulk-input-facebook_ads_insights-0.1.3.jar
 - classpath/facebook-java-business-sdk-4.0.5.jar
 - classpath/gson-2.5.jar
 - classpath/guava-20.0.jar