feat(subscription): add support for MQTT notifications #1174

thomasBousselin · 2024-05-31T10:58:17Z

Adding Mqtt notification (spec 7.2)

github-actions · 2024-05-31T11:04:47Z

Test Results

58 files +1 58 suites +1 1m 24s ⏱️ -1s
992 tests +8 992 ✅ +8 0 💤 ±0 0 ❌ ±0
1 031 runs +8 1 031 ✅ +8 0 💤 ±0 0 ❌ ±0

Results for commit 6765119. ± Comparison against base commit 0f4dbf5.

This pull request removes 187 and adds 41 tests. Note that renamed tests count towards both.

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

com.egm.stellio.search.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.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.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.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.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.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.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.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.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.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.

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

subscription-service/src/main/resources/application.properties

subscription-service/src/main/kotlin/com/egm/stellio/subscription/service/mqtt/Mqtt.kt

...-service/src/test/kotlin/com/egm/stellio/subscription/service/MqttNotificationServiceTest.kt

...ption-service/src/test/kotlin/com/egm/stellio/subscription/service/MqttVersionServiceTest.kt

...ion-service/src/test/kotlin/com/egm/stellio/subscription/service/NotificationServiceTests.kt

bobeal

A first quick review

...cription-service/src/main/kotlin/com/egm/stellio/subscription/service/NotificationService.kt

...tion-service/src/main/kotlin/com/egm/stellio/subscription/service/mqtt/MQTTVersionService.kt

...-service/src/test/kotlin/com/egm/stellio/subscription/service/MqttNotificationServiceTest.kt

...ion-service/src/test/kotlin/com/egm/stellio/subscription/service/NotificationServiceTests.kt

subscription-service/src/test/resources/mosquitto/mosquitto.conf

...-service/src/test/kotlin/com/egm/stellio/subscription/service/MqttNotificationServiceTest.kt

...cription-service/src/main/kotlin/com/egm/stellio/subscription/service/NotificationService.kt

...service/src/main/kotlin/com/egm/stellio/subscription/service/mqtt/MQTTNotificationService.kt

...tion-service/src/main/kotlin/com/egm/stellio/subscription/service/mqtt/MQTTVersionService.kt

bobeal · 2024-05-31T20:33:32Z

Also use the feature/ prefix in your branch name

...cription-service/src/main/kotlin/com/egm/stellio/subscription/service/NotificationService.kt

...service/src/main/kotlin/com/egm/stellio/subscription/service/mqtt/MqttNotificationService.kt

subscription-service/src/main/resources/application.properties

...ice/src/test/kotlin/com/egm/stellio/subscription/service/mqtt/MqttNotificationServiceTest.kt

bobeal · 2024-06-16T15:37:14Z

there are commits related to this feature that are on the feature/temporal-pagination branch. cherry-pick them on this branch.

subscription-service/src/main/resources/application.properties

...cription-service/src/main/kotlin/com/egm/stellio/subscription/service/NotificationService.kt

...service/src/main/kotlin/com/egm/stellio/subscription/service/mqtt/MqttNotificationService.kt

bobeal · 2024-06-18T05:24:53Z

@thomasBousselin it needs a rebase, the batch merge feature is in the PR

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

...ption-service/src/test/kotlin/com/egm/stellio/subscription/support/WithMosquittoContainer.kt

subscription-service/src/main/resources/application.properties

...service/src/main/kotlin/com/egm/stellio/subscription/service/mqtt/MqttNotificationService.kt

...ice/src/test/kotlin/com/egm/stellio/subscription/service/mqtt/MqttNotificationServiceTest.kt

…eceived

sonarcloud · 2024-07-24T12:30:28Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

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

See analysis details on SonarCloud

thomasBousselin force-pushed the mqtt_notification branch from 3c616be to d790223 Compare May 31, 2024 11:02

thomasBousselin force-pushed the mqtt_notification branch from d790223 to d11fcd3 Compare May 31, 2024 11:54

thomasBousselin requested review from bobeal and ranim-n May 31, 2024 12:03

ranim-n reviewed May 31, 2024

View reviewed changes

bobeal reviewed May 31, 2024

View reviewed changes

thomasBousselin force-pushed the mqtt_notification branch from 141453e to 49e288d Compare June 3, 2024 09:53

thomasBousselin linked an issue Jun 3, 2024 that may be closed by this pull request

Add support for MQTT notifications #685

Closed

bobeal reviewed Jun 6, 2024

View reviewed changes

bobeal reviewed Jun 7, 2024

View reviewed changes

...ice/src/test/kotlin/com/egm/stellio/subscription/service/mqtt/MqttNotificationServiceTest.kt Show resolved Hide resolved

thomasBousselin force-pushed the mqtt_notification branch 2 times, most recently from 2dae40d to 02f4c45 Compare June 10, 2024 13:30

bobeal reviewed Jun 16, 2024

View reviewed changes

thomasBousselin force-pushed the batch_merge branch 2 times, most recently from 025ed9e to 9195e61 Compare June 17, 2024 08:55

Base automatically changed from batch_merge to develop June 17, 2024 13:02

thomasBousselin force-pushed the mqtt_notification branch from ae56414 to ee0f45b Compare June 19, 2024 13:05

bobeal changed the title ~~feat(mqtt notification):~~ feat(subscription): add support for MQTT notifications Jun 21, 2024

bobeal reviewed Jun 21, 2024

View reviewed changes

thomasBousselin force-pushed the mqtt_notification branch from 191217f to d909198 Compare June 21, 2024 16:32

thomasBousselin added 4 commits July 23, 2024 16:08

feat(mqtt notification):

848e7f6

fix most comment

f6b095f

feat: test suscribe to actual mqtt broker to verify the request was r…

934b24e

…eceived

feat: test suscribe to actual mqtt broker to verify the request was r…

c601f41

…eceived

thomasBousselin added 8 commits July 23, 2024 16:08

fix: MR comments

5dc8ef7

fix: syntax fixes for mr

ecfba34

fix: fix detekt

610e9d4

fix: mr comment

d8b618c

fix: add temporal pagination to queryEntitiesViaPost

3a39550

fix ; syntax

006b996

fix topic check in test

7a3602d

fix: multiple mqtt as the same

6765119

thomasBousselin force-pushed the mqtt_notification branch from d53f460 to 6765119 Compare July 23, 2024 14:09

bobeal approved these changes Jul 23, 2024

View reviewed changes

thomasBousselin merged commit e266755 into develop Jul 24, 2024
10 checks passed

thomasBousselin deleted the mqtt_notification branch July 24, 2024 12:36

github-actions bot locked and limited conversation to collaborators Jul 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(subscription): add support for MQTT notifications #1174

feat(subscription): add support for MQTT notifications #1174

thomasBousselin commented May 31, 2024

github-actions bot commented May 31, 2024 •

edited

Loading

bobeal left a comment

bobeal commented May 31, 2024

bobeal commented Jun 16, 2024

bobeal commented Jun 18, 2024

sonarcloud bot commented Jul 24, 2024

feat(subscription): add support for MQTT notifications #1174

feat(subscription): add support for MQTT notifications #1174

Conversation

thomasBousselin commented May 31, 2024

github-actions bot commented May 31, 2024 • edited Loading

Test Results

bobeal left a comment

Choose a reason for hiding this comment

bobeal commented May 31, 2024

bobeal commented Jun 16, 2024

bobeal commented Jun 18, 2024

sonarcloud bot commented Jul 24, 2024

Quality Gate passed

github-actions bot commented May 31, 2024 •

edited

Loading