fix to the reference data download to include the user rating stabilities

Author: andponlin

haikudepotserver-core-test/src/test/java/org/haiku/haikudepotserver/reference/job/ReferenceDumpExportJobRunnerIT.java

@@ -15,19 +15,13 @@
 import org.haiku.haikudepotserver.job.model.JobService;
 import org.haiku.haikudepotserver.job.model.JobSnapshot;
 import org.haiku.haikudepotserver.reference.model.ReferenceDumpExportJobSpecification;
-import org.haiku.haikudepotserver.support.DateTimeHelper;
+import org.haiku.haikudepotserver.support.RuntimeInformationService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;
 
 import javax.annotation.Resource;
-import javax.sql.DataSource;
 import java.io.InputStream;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Date;
 import java.util.Optional;
 import java.util.stream.IntStream;
 import java.util.zip.GZIPInputStream;
@@ -42,7 +36,7 @@ public class ReferenceDumpExportJobRunnerIT extends AbstractIntegrationTest {
     private ObjectMapper objectMapper;
 
     @Resource
-    private DataSource dataSource;
+    private RuntimeInformationService runtimeInformationService;
 
     /**
      * <p>Uses the sample data and checks that the output from the report matches a captured, sensible-looking
@@ -52,10 +46,9 @@ public class ReferenceDumpExportJobRunnerIT extends AbstractIntegrationTest {
     @Test
     public void testRun() throws Exception {
 
-        long now = DateTimeHelper.secondAccuracyDate(new Date()).getTime();
         ReferenceDumpExportJobSpecification specification = new ReferenceDumpExportJobSpecification();
         specification.setNaturalLanguageCode(NaturalLanguage.CODE_GERMAN);
-        java.util.Date latestModifyTimestamp = getLatestReferenceDataDate();
+        java.util.Date latestModifyTimestamp = new java.util.Date(runtimeInformationService.getBuildTimestamp().toEpochMilli());
 
         // ------------------------------------
         String guid = jobService.submit(
@@ -99,28 +92,12 @@ public void testRun() throws Exception {
             // the request was in German so the results should be in German too.
             JsonNode pkgCategoriesArrayNode = rootNode.get("pkgCategories");
             assertItemWithCodeAndName(pkgCategoriesArrayNode, "graphics", "Grafik");
-        }
-
-    }
-
-    private java.util.Date getLatestReferenceDataDate() throws SQLException {
 
-        String query = "WITH mt AS (SELECT modify_timestamp FROM haikudepot.country\n"
-                + "UNION SELECT modify_timestamp FROM haikudepot.natural_language\n"
-                + "UNION SELECT modify_timestamp FROM haikudepot.pkg_category)\n"
-                + "SELECT MAX(mt.modify_timestamp) FROM mt";
-
-        try (
-                Connection connection = dataSource.getConnection();
-                PreparedStatement statement = connection.prepareStatement(query);
-                ResultSet resultSet = statement.executeQuery()
-                ) {
-            while (resultSet.next()) {
-                return DateTimeHelper.secondAccuracyDate(resultSet.getTimestamp(1));
-            }
-
-            throw new AssertionError("unable to get the latest reference data date");
+            // check a user rating stability
+            JsonNode userRatingStabilitiesArrayNode = rootNode.get("userRatingStabilities");
+            assertItemWithCodeAndName(userRatingStabilitiesArrayNode, "unstablebutusable", "Nicht stabil, aber benutzbar");
         }
+
     }
 
     private void assertItemWithCodeAndName(JsonNode array, String code, String name) {

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/reference/job/ReferenceDumpExportJobRunner.java

@@ -14,15 +14,13 @@
 import org.haiku.haikudepotserver.dataobjects.Country;
 import org.haiku.haikudepotserver.dataobjects.NaturalLanguage;
 import org.haiku.haikudepotserver.dataobjects.PkgCategory;
+import org.haiku.haikudepotserver.dataobjects.UserRatingStability;
 import org.haiku.haikudepotserver.job.AbstractJobRunner;
 import org.haiku.haikudepotserver.job.model.JobDataWithByteSink;
 import org.haiku.haikudepotserver.job.model.JobService;
 import org.haiku.haikudepotserver.pkg.job.PkgDumpExportJobRunner;
 import org.haiku.haikudepotserver.reference.model.ReferenceDumpExportJobSpecification;
-import org.haiku.haikudepotserver.reference.model.dumpexport.DumpExportReference;
-import org.haiku.haikudepotserver.reference.model.dumpexport.DumpExportReferenceCountry;
-import org.haiku.haikudepotserver.reference.model.dumpexport.DumpExportReferenceNaturalLanguage;
-import org.haiku.haikudepotserver.reference.model.dumpexport.DumpExportReferencePkgCategory;
+import org.haiku.haikudepotserver.reference.model.dumpexport.*;
 import org.haiku.haikudepotserver.support.ArchiveInfo;
 import org.haiku.haikudepotserver.support.RuntimeInformationService;
 import org.haiku.haikudepotserver.support.cayenne.GeneralQueryHelper;
@@ -99,6 +97,8 @@ private void writeData(
         objectMapper.writeValue(jsonGenerator, dumpExportReference.getNaturalLanguages());
         jsonGenerator.writeFieldName("pkgCategories");
         objectMapper.writeValue(jsonGenerator, dumpExportReference.getPkgCategories());
+        jsonGenerator.writeFieldName("userRatingStabilities");
+        objectMapper.writeValue(jsonGenerator, dumpExportReference.getUserRatingStabilities());
     }
 
     public static Date getModifyTimestamp(ObjectContext context, RuntimeInformationService runtimeInformationService) {
@@ -166,6 +166,21 @@ private DumpExportReference createDumpExportReference(ReferenceDumpExportJobSpec
                         })
                         .collect(Collectors.toList()));
 
+        dumpExportReference.setUserRatingStabilities(
+                UserRatingStability.getAll(context)
+                        .stream()
+                        .map(urs -> {
+                            DumpExportReferenceUserRatingStability derurs = new DumpExportReferenceUserRatingStability();
+                            derurs.setCode(urs.getCode());
+                            derurs.setName(
+                                    messageSource.getMessage(
+                                            urs.getTitleKey(),
+                                            new Object[] {},
+                                            naturalLanguage.toLocale()));
+                            return derurs;
+                        })
+                        .collect(Collectors.toList()));
+
         return dumpExportReference;
     }
 

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/support/URLHelperService.java

@@ -90,8 +90,6 @@ public Optional<Long> tryGetPayloadLength(URL url) throws IOException {
     }
 
     private Optional<Long> tryGetPayloadLengthHttp(URI uri) throws IOException {
-//        return Optional.empty();
-//    }
         try {
             HttpResponse<?> response = httpClient.send(HttpRequest.newBuilder(uri)
                     .method("HEAD", HttpRequest.BodyPublishers.noBody())