Add new fields from system_information

entur · Jun 6, 2024 · a015c00 · a015c00
1 parent 40ac0e0
commit a015c00
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 3 deletions.
diff --git a/src/main/java/org/entur/lamassu/mapper/entitymapper/SystemMapper.java b/src/main/java/org/entur/lamassu/mapper/entitymapper/SystemMapper.java
@@ -26,8 +26,10 @@
 import org.entur.lamassu.model.entities.RentalApp;
 import org.entur.lamassu.model.entities.RentalApps;
 import org.entur.lamassu.model.entities.System;
+import org.entur.lamassu.model.entities.TranslatedString;
 import org.entur.lamassu.model.provider.FeedProvider;
 import org.mobilitydata.gbfs.v3_0.system_information.GBFSAndroid;
+import org.mobilitydata.gbfs.v3_0.system_information.GBFSAttributionOrganizationName;
 import org.mobilitydata.gbfs.v3_0.system_information.GBFSBrandAssets;
 import org.mobilitydata.gbfs.v3_0.system_information.GBFSData;
 import org.mobilitydata.gbfs.v3_0.system_information.GBFSIos;
@@ -131,6 +133,9 @@ public System mapSystem(GBFSData systemInformation, FeedProvider feedProvider) {
         .orElse(null)
     );
     system.setPrivacyLastUpdated(systemInformation.getPrivacyLastUpdated());
+    system.setAttributionOrganizationName(
+      mapAttributionOrganizationName(systemInformation.getAttributionOrganizationName())
+    );
     system.setRentalApps(mapRentalApps(systemInformation.getRentalApps()));
     return system;
   }
@@ -150,6 +155,23 @@ private BrandAssets mapBrandAssets(GBFSBrandAssets brandAssets) {
     return mapped;
   }
 
+  private TranslatedString mapAttributionOrganizationName(
+    List<GBFSAttributionOrganizationName> attributionOrganizationName
+  ) {
+    if (attributionOrganizationName == null) {
+      return null;
+    }
+
+    var mapped = new TranslatedString();
+    mapped.setTranslation(
+      attributionOrganizationName
+        .stream()
+        .map(name -> translationMapper.mapTranslation(name.getLanguage(), name.getText()))
+        .toList()
+    );
+    return mapped;
+  }
+
   private RentalApps mapRentalApps(GBFSRentalApps sourceRentalApps) {
     if (sourceRentalApps == null) {
       return null;

diff --git a/src/main/java/org/entur/lamassu/model/entities/System.java b/src/main/java/org/entur/lamassu/model/entities/System.java
@@ -23,6 +23,8 @@ public class System implements Entity {
   private String termsLastUpdated;
   private String privacyUrl;
   private String privacyLastUpdated;
+  private TranslatedString attributionOrganizationName;
+  private String attributionUrl;
   private RentalApps rentalApps;
 
   @Override
@@ -178,6 +180,24 @@ public void setPrivacyLastUpdated(String privacyLastUpdated) {
     this.privacyLastUpdated = privacyLastUpdated;
   }
 
+  public TranslatedString getAttributionOrganizationName() {
+    return attributionOrganizationName;
+  }
+
+  public void setAttributionOrganizationName(
+    TranslatedString attributionOrganizationName
+  ) {
+    this.attributionOrganizationName = attributionOrganizationName;
+  }
+
+  public String getAttributionUrl() {
+    return attributionUrl;
+  }
+
+  public void setAttributionUrl(String attributionUrl) {
+    this.attributionUrl = attributionUrl;
+  }
+
   public RentalApps getRentalApps() {
     return rentalApps;
   }

diff --git a/src/main/resources/graphql/schema.graphqls b/src/main/resources/graphql/schema.graphqls
@@ -277,6 +277,8 @@ type System {
     termsLastUpdated: String
     privacyUrl: String
     privacyLastUpdated: String
+    attributionOrganizationName: TranslatedString
+    attributionUrl: String
     rentalApps: RentalApps
 }
 

diff --git a/src/test/java/org/entur/lamassu/integration/GraphQLIntegrationTest.java b/src/test/java/org/entur/lamassu/integration/GraphQLIntegrationTest.java
@@ -61,6 +61,12 @@ public void testVehiclesByIdQuery() throws IOException, InterruptedException {
       response.get("$.data.vehicles[0].id")
     );
     assertEquals("TST:Vehicle:1235", response.get("$.data.vehicles[1].id"));
+    assertEquals(
+      "Another company",
+      response.get(
+        "$.data.vehicles[0].system.attributionOrganizationName.translation[0].value"
+      )
+    );
   }
 
   @Test

diff --git a/src/test/resources/v3/system_information.json b/src/test/resources/v3/system_information.json
@@ -46,6 +46,13 @@
       }
     ],
     "privacy_last_updated": "2019-01-13",
+    "attribution_organization_name": [
+      {
+        "text": "Another company",
+        "language": "en"
+      }
+    ],
+    "attribution_url": "https://another.com",
     "rental_apps": {
       "android": {
         "discovery_uri": "com.example.android://",
@@ -65,4 +72,4 @@
     }
 
   }
-}
+}
diff --git a/src/test/resources/vehicle_by_id_query.graphql b/src/test/resources/vehicle_by_id_query.graphql
@@ -75,4 +75,4 @@
             }
         }
     }
-}
+}
diff --git a/src/test/resources/vehicles_by_id_query.graphql b/src/test/resources/vehicles_by_id_query.graphql
@@ -57,6 +57,13 @@
                     }
                 }
             }
+            attributionOrganizationName {
+                translation {
+                    language
+                    value
+                }
+            }
+            attributionUrl
             rentalApps {
                 android {
                     storeUri
@@ -75,4 +82,4 @@
             }
         }
     }
-}
+}