From f2c360700180d3d49f26b5831b6775129f99f414 Mon Sep 17 00:00:00 2001
From: Eric Darchis <darchis@pobox.com>
Date: Thu, 4 Nov 2021 09:50:42 +0100
Subject: [PATCH 1/3] Better error reporting, use cli_app_name

---
 .github/workflows/manual.yml                                | 6 +++---
 .../src/main/java/org/openimis/imisclaims/ToRestApi.java    | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
index b878b4ed..a0a77ef2 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -7,7 +7,7 @@ on:
         description: URL of the REST API
         required: true
         default: https://release.openimis.org/rest/
-      app_name:
+      cli_app_name:
         description: Display name of the application
         required: false
         default: Claims Manual
@@ -41,14 +41,14 @@ jobs:
         run: |
           gradle --version
           echo url ${{ github.event.inputs.api_base_url }}
-          echo app name ${{ github.event.inputs.app_name }}
+          echo app name ${{ github.event.inputs.cli_app_name }}
 
       - name: build
         run: |
           ./gradlew assembleCliDebug --stacktrace
         env:
           API_BASE_URL: "${{ github.event.inputs.api_base_url }}"
-          CLI_APP_NAME: "${{ github.event.inputs.app_name }}"
+          CLI_APP_NAME: "${{ github.event.inputs.cli_app_name }}"
           CLI_APP_DIR: "${{ github.event.inputs.app_dir }}"
           CLI_JAVA_DIR: "${{ github.event.inputs.cli_java_dir }}"
           CLI_RES_DIR: "${{ github.event.inputs.cli_res_dir }}"
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/ToRestApi.java b/claimManagement/src/main/java/org/openimis/imisclaims/ToRestApi.java
index ef0cc776..ab059440 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/ToRestApi.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/ToRestApi.java
@@ -64,6 +64,9 @@ public HttpResponse postToRestApi(Object object, String functionName, boolean ad
             HttpResponse response = httpClient.execute(httpPost);
             int responseCode = response.getStatusLine().getStatusCode();
             Log.i("HTTP_POST", uri + functionName + " - " + responseCode);
+            if (responseCode >= 400) {
+                Log.e("HTTP_POST", object.toString());
+            }
             return response;
         } catch (IOException e) {
             e.printStackTrace();

From e7405602df85e11ed31fc228f3c00dbabbfa0a70 Mon Sep 17 00:00:00 2001
From: Eric Darchis <darchis@pobox.com>
Date: Thu, 4 Nov 2021 16:35:14 +0100
Subject: [PATCH 2/3] Add error payload to the logs

So far, we only knew that the call had failed, not why. With this, we'll have the error payload.
---
 .../src/main/java/org/openimis/imisclaims/ToRestApi.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/ToRestApi.java b/claimManagement/src/main/java/org/openimis/imisclaims/ToRestApi.java
index ab059440..896393f3 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/ToRestApi.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/ToRestApi.java
@@ -66,6 +66,11 @@ public HttpResponse postToRestApi(Object object, String functionName, boolean ad
             Log.i("HTTP_POST", uri + functionName + " - " + responseCode);
             if (responseCode >= 400) {
                 Log.e("HTTP_POST", object.toString());
+                HttpEntity entity = response.getEntity();
+                if (entity != null) {
+                    String errorPayload = EntityUtils.toString(entity);
+                    Log.e("HTTP_POST", "error payload" + errorPayload);
+                }
             }
             return response;
         } catch (IOException e) {

From 69055ad8589f4bba04ecd3e0e3a2385f5e34e954 Mon Sep 17 00:00:00 2001
From: Eric Darchis <darchis@pobox.com>
Date: Tue, 9 Nov 2021 09:44:30 +0100
Subject: [PATCH 3/3] Cache gradle/android artefacts

---
 .github/workflows/manual.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
index a0a77ef2..12e47ebc 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -37,6 +37,19 @@ jobs:
         with:
           java-version: 1.8
 
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-${{ github.event.inputs.application_id }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }}
+
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.android
+          key: ${{ runner.os }}-${{ github.event.inputs.application_id }}
+
       - name: Environment info
         run: |
           gradle --version