embulk-input-adebis 0.0.1.pre4 → 0.0.1.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f471449ae7accd3e36ecfdce2ccfc1f68214e7ac
-  data.tar.gz: b6fbee0d48f0bb78cb7db50d338c3059ff721489
+  metadata.gz: 3eca218a64d051ae548b314eed0c189ac300c182
+  data.tar.gz: 0fbb66355842cbb209ac04754a33537f199e443a
 SHA512:
-  metadata.gz: f4206be4fa2cc69f9242a9c56692cf1e924996f258576beccfe0829c56d703f1b03e0e297c804df4de29025c231c1d81895e995f1116e071503d728bf197de5e
-  data.tar.gz: be79906b08ad011c59ddfd1f1c46f1fd22762ea783604ffa72245149ec8f8a4d8be903e34113b506da71f01838fe1b5f0f4c2981f39e74bd68b94c7517126309
+  metadata.gz: 7960e41ad2837dae51a46b3eddae368ade31fb3b5c865761137faaaaf8705392b38c99f7b3a9d752501dfb20f66d18362113fa13f0e5658263934df0cae19b10
+  data.tar.gz: 14ee60705c8eec1b349a6459dcc59b3e21ad7d4e189d5218ffa1aa491e4cbcc4b87759fdc777e1ae4bac00c449d23a9d0007b3c44ce20ba90d009f05f955e01f

data/src/main/java/org/embulk/input/adebis/operation/Ad.java

@@ -96,8 +96,9 @@ public class Ad extends AbstractOperation {
      */
 
     public void run(PageBuilder pageBuilder) {
-        long lastRecordId = 0;
+        long lastRecordId    = 0;
         long currentRecordId = 0;
+        long latestRecordId  = 0;
 
         Schema schema = pageBuilder.getSchema();
         AdManagementService adManagementService;
@@ -127,6 +128,7 @@ public class Ad extends AbstractOperation {
         if(getLastRecordId().isPresent()) {
             lastRecordId = Long.parseLong(getLastRecordId().get());
         }
+        latestRecordId = lastRecordId;
 
         //if(lastRecordTime.isAfter(startDate.atStartOfDay())) {
         //    startDate = lastRecordTime.toLocalDate();
@@ -169,13 +171,18 @@ public class Ad extends AbstractOperation {
             else break;
             for (jp.ne.ebis.extreme.ws.entity.xsd.Ad record : results) {
                 Boolean isExcluded = false;
-                currentRecordId = record.getCreated();
-                if ( ! record.isCreatedSpecified()) {
+                if ( ! record.isModifiedSpecified()) {
                     break;
                 }
+                currentRecordId = record.getModified();
+                // 前回処理時の最新更新時間を越えていなければ保存しない
                 if (lastRecordId >= currentRecordId) {
                     continue;
                 }
+                // 今回処理時の最新更新時間
+                if (latestRecordId <= currentRecordId) {
+                    latestRecordId = currentRecordId;
+                }
                 for (Column c : schema.getColumns()) {
                     switch (c.getName()) {
                         case "adId":
@@ -300,7 +307,7 @@ public class Ad extends AbstractOperation {
         }
 
         setLastRecordTime(Optional.of(newestRecordTime.format(embulkDateTimeFormat)));
-        setLastRecordId(Optional.of(String.valueOf(currentRecordId)));
+        setLastRecordId(Optional.of(String.valueOf(latestRecordId)));
     }
 
     public Schema buildSchema() {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-adebis
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre4
+  version: 0.0.1.pre5
 platform: ruby
 authors:
 - Takuya Tokuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler