feat: add language filter to sub attributes #1274

ranim-n · 2024-11-28T15:54:53Z

No description provided.

shared/src/main/kotlin/com/egm/stellio/shared/model/CompactedEntity.kt

thomasBousselin · 2024-11-28T16:23:29Z

shared/src/main/kotlin/com/egm/stellio/shared/model/CompactedEntity.kt

+                entry.key to (entry.value as CompactedEntity).toFilteredLanguageProperties(languageFilter)
+            !JSONLD_COMPACTED_ATTRIBUTE_CORE_MEMBERS.contains(entry.key) ->
+                entry.key to filterLanguageProperty(entry.value as Map<String, Any>, transformationParameters)
+            else -> entry.key to entry.value


if you want to keep entry as the argument (as you want) you can use entry.toPair()

current is easier to read as it is similar to other branches in the when

github-actions · 2024-11-28T21:55:24Z

Test Results

69 files + 8 69 suites +8 1m 27s ⏱️ +33s
1 096 tests +160 1 096 ✅ +160 0 💤 ±0 0 ❌ ±0
1 135 runs +160 1 135 ✅ +160 0 💤 ±0 0 ❌ ±0

Results for commit 0403c57. ± Comparison against base commit f3d668b.

This pull request removes 189 and adds 193 tests. Note that renamed tests count towards both.

                                    { "id":…, withTemporalValues=true, withAudit=false, expectation={
                      "@id": "https://uri…
                      "@type": "@json",
                      …
                    "@value": "/A/B"
                    "@value": "/C/D"
                    "@value": 20
                    "…
                    {
                  "@type": "https://uri.etsi.org/ngsi-ld/DateTime",
…

com.egm.stellio.search.entity.util.PatchAttributeTests ‑ [1] source={
    "attribute": {
        "type": "Property",
        "value": 12.0,
        "observedAt": "2024-04-14T12:34:56Z"
    }
}, target={
    "attribute": {
        "type": "Property",
        "value": 12.2,
        "unitCode": "GRM"
    }
}, expected={
    "attribute": {
        "type": "Property",
        "value": 12.2,
        "unitCode": "GRM",
        "observedAt": "2024-04-14T12:34:56Z"
    }
}
com.egm.stellio.search.entity.util.PatchAttributeTests ‑ [1] source={
    "attribute": {
        "type": "Property",
        "value": 12.0,
        "observedAt": "2024-04-14T12:34:56Z",
        "subAttribute": {
            "type": "Property",
            "value": "subAttribute"
        }
    }
}, target={
    "attribute": {
        "type": "Property",
        "value": 12.2,
        "unitCode": "GRM",
        "subAttribute": {
            "type": "Property",
            "value": "newSubAttributeValue"
        }
    }
}, expected={
    "attribute": {
        "type": "Property",
        "value": 12.2,
        "unitCode": "GRM",
        "observedAt": "2024-04-14T12:34:56Z",
        "subAttribute": {
            "type": "Property",
            "value": "newSubAttributeValue"
        }
    }
}
com.egm.stellio.search.entity.util.PatchAttributeTests ‑ [2] source={
    "attribute": {
        "type": "Property",
        "value": { "en": "car", "fr": "voiture" }
    }
}, target={
    "attribute": {
        "type": "Property",
        "value": { "fr": "vélo", "es": "bicicleta" }
    }
}, expected={
    "attribute": {
        "type": "Property",
        "value": { "en": "car", "fr": "vélo", "es": "bicicleta" }
    }
}
com.egm.stellio.search.entity.util.PatchAttributeTests ‑ [2] source={
    "incoming": {
        "type": "JsonProperty",
        "json": { "id": 1, "b": null, "c": 12.4 },
        "observedAt": "2022-12-24T14:01:22.066Z",
        "subAttribute": {
            "type": "Property",
            "value": "subAttribute"
        }
    }
}, target={
    "incoming": {
        "type": "JsonProperty",
        "json": { "id": 2, "b": "something" },
        "observedAt": "2023-12-24T14:01:22.066Z"
    }
}, expected={
    "incoming": {
        "type": "JsonProperty",
        "json": { "id": 2, "b": "something" },
        "observedAt": "2023-12-24T14:01:22.066Z",
        "subAttribute": {
            "type": "Property",
            "value": "subAttribute"
        }
    }
}
com.egm.stellio.search.entity.util.PatchAttributeTests ‑ [3] source={
    "attribute": {
        "type": "Property",
        "value": [ "car", "voiture" ]
    }
}, target={
    "attribute": {
        "type": "Property",
        "value": [ "vélo", "bicicleta" ]
    }
}, expected={
    "attribute": {
        "type": "Property",
        "value": [ "vélo", "bicicleta" ]
    }
}
com.egm.stellio.search.entity.util.PatchAttributeTests ‑ [3] source={
    "attribute": {
        "type": "VocabProperty",
        "vocab": "stellio"
    }
}, target={
    "attribute": {
        "type": "VocabProperty",
        "vocab": "egm"
    }
}, expected={
    "attribute": {
        "type": "VocabProperty",
        "vocab": "egm"
    }
}
com.egm.stellio.search.entity.util.PatchAttributeTests ‑ [4] source={
    "attribute": {
        "type": "Relationship",
        "object": "urn:ngsi-ld:Entity:01"
    }
}, target={
    "attribute": {
        "type": "Relationship",
        "object": "urn:ngsi-ld:Entity:02"
    }
}, expected={
    "attribute": {
        "type": "Relationship",
        "object": "urn:ngsi-ld:Entity:02"
    }
}
com.egm.stellio.search.entity.util.PatchAttributeTests ‑ [5] source={
    "attribute": {
        "type": "LanguageProperty",
        "languageMap": { "en": "train", "fr": "train" }
    }
}, target={
    "attribute": {
        "type": "LanguageProperty",
        "languageMap": { "fr": "TGV", "es": "tren" }
    }
}, expected={
    "attribute": {
        "type": "LanguageProperty",
        "languageMap": { "en": "train", "fr": "TGV", "es": "tren" }
    }
}
com.egm.stellio.search.entity.util.PatchAttributeTests ‑ [6] source={
    "incoming": {
        "type": "JsonProperty",
        "json": { "a": 1, "b": "thing" }
    }
}, target={
    "incoming": {
        "type": "JsonProperty",
        "json": { "a": 2, "c": "other thing" }
    }
}, expected={
    "incoming": {
        "type": "JsonProperty",
        "json": { "a": 2, "b": "thing", "c": "other thing" }
    }
}
com.egm.stellio.search.entity.util.PatchAttributeTests ‑ [7] source={
    "attribute": {
        "type": "VocabProperty",
        "vocab": "stellio"
    }
}, target={
    "attribute": {
        "type": "VocabProperty",
        "vocab": "egm"
    }
}, expected={
    "attribute": {
        "type": "VocabProperty",
        "vocab": "egm"
    }
}
…

♻️ This comment has been updated with latest results.

bobeal · 2024-11-29T06:10:45Z

shared/src/main/kotlin/com/egm/stellio/shared/model/CompactedEntity.kt

@@ -42,6 +46,20 @@ typealias CompactedEntity = Map<String, Any>
 typealias CompactedAttributeInstance = Map<String, Any>
 typealias CompactedAttributeInstances = List<CompactedAttributeInstance>

+val JSONLD_COMPACTED_ATTRIBUTE_CORE_MEMBERS =


JSONLD_LANGUAGEMAP_TERM should be in the list (if it is not in the list, it is a trap for future users of your list)

bobeal · 2024-11-29T06:34:45Z

shared/src/main/kotlin/com/egm/stellio/shared/model/CompactedEntity.kt

+                entry.key to (entry.value as CompactedEntity).toFilteredLanguageProperties(languageFilter)
+            !JSONLD_COMPACTED_ATTRIBUTE_CORE_MEMBERS.contains(entry.key) ->
+                entry.key to filterLanguageProperty(entry.value as Map<String, Any>, transformationParameters)
+            else -> entry.key to entry.value


current is easier to read as it is similar to other branches in the when

bobeal · 2024-11-29T06:36:33Z

I added a test that fails (but should not )

bobeal

did some changes to remove detekt warning and more fluent processing

…ntity.kt Co-authored-by: Thomas Bousselin <[email protected]>

sonarqubecloud · 2024-12-03T08:21:39Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
97.8% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

ranim-n added feature New feature or request core Relates to core API labels Nov 28, 2024

ranim-n requested review from bobeal and thomasBousselin November 28, 2024 15:54

ranim-n self-assigned this Nov 28, 2024

ranim-n linked an issue Nov 28, 2024 that may be closed by this pull request

LanguageProperty not being filtered on the subproperty level #1251

Closed

thomasBousselin reviewed Nov 28, 2024

View reviewed changes

shared/src/main/kotlin/com/egm/stellio/shared/model/CompactedEntity.kt Outdated Show resolved Hide resolved

thomasBousselin reviewed Nov 28, 2024

View reviewed changes

bobeal reviewed Nov 29, 2024

View reviewed changes

bobeal force-pushed the feature/add-language-filter-to-sub-attributes branch from dc3fa78 to 10ed185 Compare November 30, 2024 09:05

bobeal approved these changes Nov 30, 2024

View reviewed changes

thomasBousselin approved these changes Dec 2, 2024

View reviewed changes

ranim-n and others added 5 commits December 3, 2024 09:14

feat: add language filter to sub attributes

3d2ff51

added a test that fails

199d844

Update shared/src/main/kotlin/com/egm/stellio/shared/model/CompactedE…

7c5ff11

…ntity.kt Co-authored-by: Thomas Bousselin <[email protected]>

fix for failing test

3dfa4e6

fix: nested block depth / more functional way

0403c57

ranim-n force-pushed the feature/add-language-filter-to-sub-attributes branch from 10ed185 to 0403c57 Compare December 3, 2024 08:15

ranim-n merged commit 9417306 into develop Dec 3, 2024
11 checks passed

ranim-n deleted the feature/add-language-filter-to-sub-attributes branch December 3, 2024 08:26

github-actions bot locked and limited conversation to collaborators Dec 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add language filter to sub attributes #1274

feat: add language filter to sub attributes #1274

ranim-n commented Nov 28, 2024

thomasBousselin Nov 28, 2024

bobeal Nov 29, 2024

github-actions bot commented Nov 28, 2024 •

edited

Loading

bobeal Nov 29, 2024

bobeal Nov 29, 2024

bobeal commented Nov 29, 2024

bobeal left a comment

sonarqubecloud bot commented Dec 3, 2024

feat: add language filter to sub attributes #1274

feat: add language filter to sub attributes #1274

Conversation

ranim-n commented Nov 28, 2024

thomasBousselin Nov 28, 2024

Choose a reason for hiding this comment

bobeal Nov 29, 2024

Choose a reason for hiding this comment

github-actions bot commented Nov 28, 2024 • edited Loading

Test Results

bobeal Nov 29, 2024

Choose a reason for hiding this comment

bobeal Nov 29, 2024

Choose a reason for hiding this comment

bobeal commented Nov 29, 2024

bobeal left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Dec 3, 2024

Quality Gate passed

github-actions bot commented Nov 28, 2024 •

edited

Loading