ARKIV-321 arkivdel vs recno:arkivdel. Værsågod. Bare hyggelig. (#190)

FINTLabs · Dec 3, 2024 · 5b783df · 5b783df
1 parent 11a6876
commit 5b783df
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/no/fint/p360/data/utilities/ODataFilterUtils.java b/src/main/java/no/fint/p360/data/utilities/ODataFilterUtils.java
@@ -7,6 +7,7 @@
 import no.p360.model.CaseService.GetCasesArgs;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -61,6 +62,13 @@ private Map.Entry<String, String> fromODataToP360CaseArgs(ODataParser.Comparison
         String oDataOperator = context.comparisonOperator().getText();
         String oDataValue = context.value().getText().replaceAll("'", "");
 
+        if ("arkivdel".equalsIgnoreCase(oDataProperty) && StringUtils.isNumeric(oDataValue)) {
+            log.info("Custon P360 h4ck to prefix our OData filter with 'recno:'");
+            oDataValue = "recno:".concat(oDataValue);
+
+            log.debug("The new modified ODatafitler value: {}", oDataValue);
+        }
+
         if (!"eq".equals(oDataOperator)) {
             throw new IllegalODataFilter(String.format("OData operator %s is not supported. Currently only support for 'eq' operator.", oDataOperator));
         }

diff --git a/src/test/groovy/no/fint/p360/data/utilities/ODataFilterUtilsSpec.groovy b/src/test/groovy/no/fint/p360/data/utilities/ODataFilterUtilsSpec.groovy
@@ -18,7 +18,8 @@ class ODataFilterUtilsSpec extends Specification {
         query                                                                             | expected                               | propertyGetter
         "mappeid eq '24/00027'"                                                           | "24/00027"                             | { it.getCaseNumber() }
         "systemid eq '201927'"                                                            | 201927                                 | { it.getRecno() }
-        "arkivdel eq '60001'"                                                             | "60001"                                | { it.getSubArchive() }
+        "arkivdel eq '60001'"                                                             | "recno:60001"                          | { it.getSubArchive() }
+        "arkivdel eq 'Opplæring'"                                                         | "Opplæring"                            | { it.getSubArchive() }
         "klassifikasjon/primar/verdi eq 'C52'"                                            | "C52"                                  | { it.getArchiveCode() }
         "klassifikasjon/primar/ordning eq 'ORG' and klassifikasjon/primar/verdi eq '123'" | "123"                                  | { it.getArchiveCode() }
         "kontaktid eq '08089312345'"                                                      | "08089312345"                          | { it.getContactReferenceNumber() }