96

.circleci/config.yml

@@ -54,7 +54,8 @@ jobs:
                             gradle clean build sonarqube \
                                 -Pversion=$CIRCLE_TAG \
                                 -PpullRequestKey=$PR_NUMBER \
-                                --info
+                                --info \
+                                --console=plain
             -   run:
                     name: codecov
                     command: bash <(curl -s https://codecov.io/bash)

Makefile

@@ -1,6 +1,8 @@
 include .env
 export $(shell sed 's/=.*//' .env)
 
+.PHONY: bin build gradle src var
+
 tag:
 	bash bin/create_tag.sh -n1
 
@@ -56,4 +58,4 @@ pdd:
 	pdd --source=/main --exclude=.idea/**/* --verbose --file=/dev/null
 
 build:
-	bash bin/gradle_in_docker.sh clean build --info
+	bash bin/gradle_in_docker.sh clean build --info --console=verbose

src/main/java/dev/iakunin/codexiabot/codexia/entity/CodexiaProject.java

@@ -27,7 +27,7 @@ public static CodexiaProject from(CodexiaClient.Project from) {
             return new CodexiaProject()
                 .setExternalId(from.getId())
                 .setCoordinates(from.getCoordinates())
-                .setAuthor(from.getAuthor())
+                .setAuthor(from.getSubmitter().getLogin())
                 .setDeleted(from.getDeleted())
                 .setProjectCreatedAt(
                     Factory.toLocalDateTIme(from.getCreated())

src/main/java/dev/iakunin/codexiabot/codexia/sdk/CodexiaClient.java

@@ -63,13 +63,19 @@ ResponseEntity<String> setMeta(
     class Project {
         private Integer id;
         private String coordinates;
-        private String author;
+        private Submitter submitter;
         private String deleted;
 
         // @todo #6 write tests for different timezones
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss Z")
         // @todo #6 replace `Date` with `ZonedDateTime`
         private Date created;
+
+        @Data
+        public static class Submitter {
+            private Integer id;
+            private String login;
+        }
     }
 
     enum ReviewStatus {

src/test/java/dev/iakunin/codexiabot/codexia/cron/ProjectsHealthCheckIntegrationTest.java

@@ -8,7 +8,8 @@
 import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
 import dev.iakunin.codexiabot.AbstractIntegrationTest;
 import dev.iakunin.codexiabot.util.WireMockServer;
-import org.cactoos.text.Joined;
+import org.cactoos.io.ResourceOf;
+import org.cactoos.text.TextOf;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,17 +46,10 @@ public void twoActiveProjectsInRepoButDeletedInCodexia() {
                 .willReturn(ok()
                     .withHeader("Content-Type",  "application/json")
                     .withBody(
-                        new Joined(
-                            "\n",
-                            // @todo #6 extract to json-file
-                            "{",
-                            "    \"id\": {{ replace request.requestLine.pathSegments.[1] '.json' '' }},",
-                            "    \"coordinates\": \"test-project/test-repo\",",
-                            "    \"platform\": \"github\",",
-                            "    \"author\": \"iakunin-codexia-bot\",",
-                            "    \"created\": \"2020-03-10 19:12:21 +0000\",",
-                            "    \"deleted\": \"deleted by someone\"",
-                            "}"
+                        new TextOf(
+                            new ResourceOf(
+                                "wiremock/codexia/cron/projects-health-check/twoActiveProjectsInRepoButDeletedInCodexia.json"
+                            )
                         ).toString()
                     )
                     .withTransformers(ResponseTemplateTransformer.NAME)

src/test/resources/wiremock/codexia/cron/projects-health-check/twoActiveProjectsInRepoButDeletedInCodexia.json

@@ -0,0 +1,11 @@
+{
+  "id": {{ replace request.requestLine.pathSegments.[1] '.json' '' }},
+  "coordinates": "test-project/test-repo",
+  "platform": "github",
+  "submitter": {
+    "id": 123,
+    "login": "iakunin-codexia-bot"
+  },
+  "created": "2020-03-10 19:12:21 +0000",
+  "deleted": "deleted by someone"
+}

var/wiremock/__files/codexia/project.json

@@ -2,7 +2,10 @@
   "id": {{ replace request.requestLine.pathSegments.[2] '.json' '' }},
   "coordinates": "test-project/test-repo",
   "platform": "github",
-  "author": "iakunin-codexia-bot",
+  "submitter": {
+    "id": 123,
+    "login": "iakunin-codexia-bot"
+  },
   "created": "2020-03-10 19:12:21 +0000",
   "deleted": null
 }