embulk-input-zendesk-all 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66b582f9b7eb1e5b3269b334e7c8dd46fb8bcd01
-  data.tar.gz: 1fd7ead56fc82aa40b9d9c9786491b9de5d20fe3
+  metadata.gz: 754e901b20a46eb8ac5bce67cea26d5e591b6468
+  data.tar.gz: 7e8ff3710c2c7d958fba1e83b8e4f97a9e6dcab9
 SHA512:
-  metadata.gz: 7f8b5f051215b0cc328a96b1a7d5c6729102283821f0fbc5a9e9cf0f8a58d45e32a2d9da240a97924a6bcc0b7ccef16c35cd36936b934a96cba46f365845d25e
-  data.tar.gz: c06cf6a71c462fe6e598d2977745ec129dc5c32130c0fa63d05015b2f08c8942ed1803edb391338f760ab2652a0a3c485596672d5c842a24a2b872e546055dd8
+  metadata.gz: 37836c1dd71514cc607ea61bdc63e2b8093138cbaa61a18e68b64efda3b090a0df4cef1e05995b1fb4fd46dce65d72c8f5eac99e0ef266cdd9fa884f1d30a391
+  data.tar.gz: eb77b3fade0ae6a129e8cd5f2fcc0ec35f11878ac8656107c4124721aa4c06e05d8de2b0e0d5ed09c5c8ad9d83ef450a5c2331bb718c943cbdd819ef30f6ef7f

data/README.md

@@ -15,6 +15,7 @@ Required Embulk version >= 0.9.6.
 * DOES support JSON type columns
 * Supports satisfaction_ratings API
 * Supports ticket_metric_events API
+* Supports SLA Policies API
 
 
 * **Plugin type**: input

data/build.gradle

@@ -15,7 +15,7 @@ configurations {
     provided
 }
 
-version = "0.3.9"
+version = "0.4.0"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

data/gradlew

@@ -168,5 +168,5 @@ eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$A
 if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
-
+echo "$JAVACMD" "$@"
 exec "$JAVACMD" "$@"

data/src/main/java/org/embulk/input/zendesk/services/ZendeskNPSService.java

@@ -15,6 +15,11 @@ public class ZendeskNPSService extends ZendeskNormalServices
     {
         return true;
     }
+    @Override
+    protected String buildURI(final int page, final long startTime, final long endTime)
+    {
+        return buildURI(page, startTime);
+    }
 
     @Override
     protected String buildURI(final int page, final long startTime)

data/src/main/java/org/embulk/input/zendesk/services/ZendeskNormalServices.java

@@ -59,11 +59,15 @@ public abstract class ZendeskNormalServices implements ZendeskService
 
         return taskReport;
     }
-
     public JsonNode getDataFromPath(String path, final int page, final boolean isPreview, final long startTime)
+    {
+        return getDataFromPath(path, page,isPreview, startTime);
+    }
+
+    public JsonNode getDataFromPath(String path, final int page, final boolean isPreview, final long startTime, final long endTime)
     {
         if (path.isEmpty()) {
-            path = buildURI(page, startTime);
+            path = buildURI(page, startTime, endTime);
         }
 
         final String response = getZendeskRestClient().doGet(path, task, isPreview);
@@ -71,6 +75,8 @@ public abstract class ZendeskNormalServices implements ZendeskService
     }
 
     protected abstract String buildURI(int page, long startTime);
+    protected abstract String buildURI(int page, long startTime, long endTime);
+
 
     @VisibleForTesting
     protected ZendeskRestClient getZendeskRestClient()
@@ -287,6 +293,7 @@ public abstract class ZendeskNormalServices implements ZendeskService
     private void importDataForNonIncremental(final ZendeskInputPlugin.PluginTask task,  final int taskIndex, RecordImporter recordImporter, final boolean getStartDate)
     {
         long startTime = 0;
+        long endTime = 0;
 
         if (Target.SATISFACTION_RATINGS.equals(task.getTarget())){
             if (getStartDate && task.getStartTime().isPresent()) {
@@ -294,10 +301,16 @@ public abstract class ZendeskNormalServices implements ZendeskService
             }
             logger.info("Start time = {}", startTime);
 
+            if (task.getEndTime().isPresent()) {
+                endTime = ZendeskDateUtils.isoToEpochSecond(task.getEndTime().get());
+            }
+
+            logger.info("End time = {}", endTime);
+
             int i = 1;
             final Set<String> knownIds = ConcurrentHashMap.newKeySet();
             while (true) {
-                final JsonNode result = getDataFromPath("", taskIndex +i, false, startTime);
+                final JsonNode result = getDataFromPath("", taskIndex +i, false, startTime, endTime);
                 final Iterator<JsonNode> iterator = ZendeskUtils.getListRecords(result, task.getTarget().getJsonName());
                 while (iterator.hasNext()) {
                     final JsonNode recordJsonNode = iterator.next();

data/src/main/java/org/embulk/input/zendesk/services/ZendeskSupportAPIService.java

@@ -22,7 +22,12 @@ public class ZendeskSupportAPIService extends ZendeskNormalServices
     }
 
     @Override
-    protected String buildURI(final int page, long startTime)
+    protected String buildURI(final int page, long startTime){
+        return buildURI(page, startTime);
+    }
+
+    @Override
+    protected String buildURI(final int page, long startTime, long endTime)
     {
         final URIBuilder uriBuilder = ZendeskUtils.getURIBuilder(task.getLoginUrl()).setPath(buildPath());
 
@@ -34,11 +39,18 @@ public class ZendeskSupportAPIService extends ZendeskNormalServices
         }
         else {
             if (Target.SATISFACTION_RATINGS.equals(task.getTarget())){
-                uriBuilder.setParameter(ZendeskConstants.Field.START_TIME, String.valueOf(startTime))
-                        .setParameter("sort_by", "id")
-                        .setParameter("per_page", String.valueOf(100))
-                        .setParameter("page", String.valueOf(page));
-
+                if (endTime>0){
+                    uriBuilder.setParameter(ZendeskConstants.Field.START_TIME, String.valueOf(startTime))
+                            .setParameter(ZendeskConstants.Field.END_TIME, String.valueOf(endTime))
+                            .setParameter("sort_by", "id")
+                            .setParameter("per_page", String.valueOf(100))
+                            .setParameter("page", String.valueOf(page));
+                }else{
+                    uriBuilder.setParameter(ZendeskConstants.Field.START_TIME, String.valueOf(startTime))
+                            .setParameter("sort_by", "id")
+                            .setParameter("per_page", String.valueOf(100))
+                            .setParameter("page", String.valueOf(page));
+                }
             }
             else{
                 uriBuilder.setParameter("sort_by", "id")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-zendesk-all
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - hieu.duong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -139,8 +139,8 @@ files:
 - classpath/commons-logging-1.2.jar
 - classpath/httpcore-4.4.10.jar
 - classpath/httpclient-4.5.6.jar
+- classpath/embulk-input-zendesk-all-0.4.0.jar
 - classpath/commons-codec-1.10.jar
-- classpath/embulk-input-zendesk-all-0.3.9.jar
 homepage: https://github.com/treasure-data/embulk-input-zendesk
 licenses:
 - MIT