feat: add pic id to status

nicholasM95 · Jul 22, 2024 · 1fc5286 · 1fc5286
1 parent c51080c
commit 1fc5286
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/skoda-api-server.yaml b/skoda-api-server.yaml
@@ -744,6 +744,7 @@ components:
         - value
         - unit
         - textId
+        - picId
       type: object
       properties:
         id:
@@ -792,6 +793,10 @@ components:
           type: string
           description: textId
           example: interval.oil.distance
+        picId:
+          type: string
+          description: textId
+          example: ICON025_yellow.png
     VehicleWebResponseResource:
       required:
         - id

diff --git a/src/main/java/be/nicholas/api/status/domain/Field.java b/src/main/java/be/nicholas/api/status/domain/Field.java
@@ -3,5 +3,5 @@
 import java.time.LocalDateTime;
 
 public record Field(String id, LocalDateTime tsCarSentUtc, LocalDateTime tsCarSent, LocalDateTime tsCarCaptured, LocalDateTime tsTssReceivedUtc,
-                    Integer milCarCaptured, Integer milCarSent, String value, String unit, String textId) {
+                    Integer milCarCaptured, Integer milCarSent, String value, String unit, String textId, String picId) {
 }
diff --git a/src/main/java/be/nicholas/api/status/mapper/StatusMapperImpl.java b/src/main/java/be/nicholas/api/status/mapper/StatusMapperImpl.java
@@ -56,6 +56,7 @@ private FieldWebResponseResource createField(final Field field) {
                 .value(field.value())
                 .unit(field.unit())
                 .textId(field.textId())
+                .picId(field.picId())
                 .build();
     }
 }
diff --git a/src/main/java/be/nicholas/api/status/resource/out/FieldResponseResource.java b/src/main/java/be/nicholas/api/status/resource/out/FieldResponseResource.java
@@ -13,6 +13,7 @@ public class FieldResponseResource {
     private String value;
     private String unit;
     private String textId;
+    private String picId;
 
     public String getId() {
         return id;
@@ -93,4 +94,12 @@ public String getTextId() {
     public void setTextId(String textId) {
         this.textId = textId;
     }
+
+    public String getPicId() {
+        return picId;
+    }
+
+    public void setPicId(String picId) {
+        this.picId = picId;
+    }
 }
diff --git a/src/main/java/be/nicholas/api/status/web/out/StatusClientServiceImpl.java b/src/main/java/be/nicholas/api/status/web/out/StatusClientServiceImpl.java
@@ -36,7 +36,8 @@ private List<Data> getData(List<DataResponseResource> data) {
 
     private Field getField(FieldResponseResource field) {
         return new Field(field.getId(), field.getTsCarSentUtc(), field.getTsCarSent(), field.getTsTssReceivedUtc(),
-                field.getTsTssReceivedUtc(), field.getMilCarCaptured(), field.getMilCarSent(), field.getValue(), field.getUnit(), field.getTextId());
+                field.getTsTssReceivedUtc(), field.getMilCarCaptured(), field.getMilCarSent(), field.getValue(), field.getUnit(),
+                field.getTextId(), field.getPicId());
     }
 
     private Data getData(DataResponseResource data) {

diff --git a/src/test/java/be/nicholas/api/status/controller/StatusWebControllerTest.java b/src/test/java/be/nicholas/api/status/controller/StatusWebControllerTest.java
@@ -59,7 +59,8 @@ public void getStatus() throws Exception {
                                     "milCarSent":6,
                                     "value":"VAL",
                                     "unit":"UNIT",
-                                    "textId":"text"
+                                    "textId":"text",
+                                    "picId":"pic"
                                 }
                             ]
                         }
@@ -112,6 +113,7 @@ private static FieldResponseResource getFieldResponseResource(LocalDateTime loca
         fieldResponseResource.setValue("VAL");
         fieldResponseResource.setUnit("UNIT");
         fieldResponseResource.setTextId("text");
+        fieldResponseResource.setPicId("pic");
         return fieldResponseResource;
     }
 }