Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(subscription): add support for sysAttrs to notification params #1098

Merged
merged 7 commits into from
Mar 23, 2024

Conversation

ranim-n
Copy link
Contributor

@ranim-n ranim-n commented Feb 14, 2024

No description provided.

@github-actions github-actions bot added the feature New feature or request label Feb 14, 2024
Copy link
Contributor

github-actions bot commented Feb 14, 2024

Test Results

 56 files  ±0   56 suites  ±0   1m 20s ⏱️ -1s
928 tests +2  928 ✅ +2  0 💤 ±0  0 ❌ ±0 
967 runs  +2  967 ✅ +2  0 💤 ±0  0 ❌ ±0 

Results for commit 4c2b3c7. ± Comparison against base commit 9a23d4d.

This pull request removes 103 and adds 19 tests. Note that renamed tests count towards both.
                         …, withTemporalValues=true, withAudit=false, expectation={
                      "@type": "@json",
                    "@value": "/A/B"
                    "@value": "/C/D"
                    "@value": 20
                    "…
                    {
                  "@type": "https://uri.etsi.org/ngsi-ld/DateTime",
                  "@value": "2020-03-25T08:29:17.965206Z"
                  "@value": "2020-03-25T08:33:17.965206Z"
…
com.egm.stellio.search.util.TemporalEntityBuilderTests ‑ [10] scopeHistory=[], attributeAndResultsMap={TemporalEntityAttribute(id=cc28aecc-1329-477d-894d-24298f2f8716, entityId=urn:ngsi-ld:BeeHive:TESTC, attributeName=https://ontology.eglobalmark.com/apic#incoming, attributeType=Property, attributeValueType=STRING, datasetId=null, createdAt=2024-03-23T10:58:30.288332262Z, modifiedAt=null, payload=JsonByteArrayInput{{}})=[SimplifiedAttributeInstanceResult(temporalEntityAttribute=2eb0518b-8b25-45b4-9c61-ae6ad36320c7, value=Beehive_incoming_123, time=2020-03-25T08:29:17.965206Z), SimplifiedAttributeInstanceRe…, withTemporalValues=true, withAudit=false, expectation={
  "@id": "urn:ngsi-ld:BeeHive:TESTC",
  "@type": [
    "https://ontology.eglobalmark.com/apic#BeeHive"
  ],
  "https://ontology.eglobalmark.com/apic#incoming": [
    {
      "@type": [
        "https://uri.etsi.org/ngsi-ld/Property"
      ],
      "https://uri.etsi.org/ngsi-ld/hasValues": [
        {
          "@list": [
            {
              "@list": [
                {
                  "@value": "Beehive_incoming_123"
                },
                {
                  "@value": "2020-03-25T0…
com.egm.stellio.search.util.TemporalEntityBuilderTests ‑ [11] scopeHistory=[], attributeAndResultsMap={TemporalEntityAttribute(id=76794535-6259-4b76-951b-8dfc7f05c98e, entityId=urn:ngsi-ld:BeeHive:TESTC, attributeName=https://ontology.eglobalmark.com/apic#incoming, attributeType=Relationship, attributeValueType=STRING, datasetId=urn:ngsi-ld:Dataset:45678, createdAt=2024-03-23T10:58:30.288332262Z, modifiedAt=null, payload=JsonByteArrayInput{{}})=[SimplifiedAttributeInstanceResult(temporalEntityAttribute=05bd179f-f2f0-4e9a-9237-931280d9c847, value=urn:ngsi-ld:Entity:1234, time=2020-03-25T08:29:17.965206Z), S…, withTemporalValues=true, withAudit=false, expectation={
  "@id": "urn:ngsi-ld:BeeHive:TESTC",
  "@type": [
    "https://ontology.eglobalmark.com/apic#BeeHive"
  ],
  "https://ontology.eglobalmark.com/apic#incoming": [
    {
      "@type": [
        "https://uri.etsi.org/ngsi-ld/Relationship"
      ],
      "https://uri.etsi.org/ngsi-ld/datasetId": [
        {
          "@id": "urn:ngsi-ld:Dataset:45678"
        }
      ],
      "https://uri.etsi.org/ngsi-ld/hasObjects": [
        {
          "@list": [
            {
              "@list": [
                {
…
com.egm.stellio.search.util.TemporalEntityBuilderTests ‑ [12] scopeHistory=[SimplifiedScopeInstanceResult(entityId=urn:ngsi-ld:BeeHive:TESTC, scopes=[/A/B, /C/D], time=2020-03-25T08:29:17.965206Z), SimplifiedScopeInstanceResult(entityId=urn:ngsi-ld:BeeHive:TESTC, scopes=[/C/D], time=2020-03-25T09:29:17.965206Z)], attributeAndResultsMap={}, withTemporalValues=true, withAudit=false, expectation={
  "@id": "urn:ngsi-ld:BeeHive:TESTC",
  "@type": [
    "https://ontology.eglobalmark.com/apic#BeeHive"
  ],
  "https://uri.etsi.org/ngsi-ld/scope": {
    "@type": [
      "https://uri.etsi.org/ngsi-ld/Property"
    ],
    "https://uri.etsi.org/ngsi-ld/hasValues": [
      {
        "@list": [
          {
            "@list": [
              {
                "@list": [
                  {
                    "@value": "/A/B"
                  },
                  {
                    "@value": "/C/D"
   …
com.egm.stellio.search.util.TemporalEntityBuilderTests ‑ [13] scopeHistory=[FullScopeInstanceResult(entityId=urn:ngsi-ld:BeeHive:TESTC, scopes=[/A/B, /C/D], time=2020-03-25T08:29:17.965206Z, timeproperty=modifiedAt, sub=null), FullScopeInstanceResult(entityId=urn:ngsi-ld:BeeHive:TESTC, scopes=[/C/D], time=2020-03-25T09:29:17.965206Z, timeproperty=modifiedAt, sub=null)], attributeAndResultsMap={}, withTemporalValues=false, withAudit=false, expectation={
  "@id": "urn:ngsi-ld:BeeHive:TESTC",
  "@type": [
    "https://ontology.eglobalmark.com/apic#BeeHive"
  ],
  "https://uri.etsi.org/ngsi-ld/scope": [
    {
      "@type": [
        "https://uri.etsi.org/ngsi-ld/Property"
      ],
      "https://uri.etsi.org/ngsi-ld/hasValue": [
        {
          "@value": "/A/B"
        },
        {
          "@value": "/C/D"
        }
      ],
      "https://uri.etsi.org/ngsi-ld/modifiedAt": [
        {
          "@type": "https://uri.etsi.org/ngsi-ld/DateTime",
     …
com.egm.stellio.search.util.TemporalEntityBuilderTests ‑ [14] scopeHistory=[], attributeAndResultsMap={TemporalEntityAttribute(id=b8e9eb63-5a92-40a8-9ec1-d07dbc1f37bf, entityId=urn:ngsi-ld:BeeHive:TESTC, attributeName=https://ontology.eglobalmark.com/apic#luminosity, attributeType=JsonProperty, attributeValueType=JSON, datasetId=null, createdAt=2024-03-23T10:58:30.288332262Z, modifiedAt=null, payload=JsonByteArrayInput{{ "id": "123", "stringValue": "value", "nullValue": null }})=[SimplifiedAttributeInstanceResult(temporalEntityAttribute=be7a70f0-4b36-4550-8808-1d7b14e9c10f, value=
                         …, withTemporalValues=true, withAudit=false, expectation={
  "@id": "urn:ngsi-ld:BeeHive:TESTC",
  "@type": [
    "https://ontology.eglobalmark.com/apic#BeeHive"
  ],
  "https://ontology.eglobalmark.com/apic#luminosity": [
    {
      "@type": [
        "https://uri.etsi.org/ngsi-ld/JsonProperty"
      ],
      "https://uri.etsi.org/ngsi-ld/jsons": [
        {
          "@list": [
            {
              "@list": [
                {
                  "https://uri.etsi.org/ngsi-ld/hasJSON": [
                    {
                      "@type": "@json",
     …
com.egm.stellio.search.util.TemporalEntityBuilderTests ‑ [1] entityTemporalResults=[EntityTemporalResult(entityPayload=EntityPayload(entityId=urn:ngsi-ld:BeeHive:TESTC, types=[https://ontology.eglobalmark.com/apic#BeeHive], scopes=null, createdAt=2024-03-23T10:58:30.274561206Z, modifiedAt=null, payload=JsonByteArrayInput{{}}, specificAccessPolicy=null), scopeHistory=[], teaInstancesResult={TemporalEntityAttribute(id=ff1254f3-347a-4824-afcd-296b09af56ec, entityId=urn:ngsi-ld:BeeHive:TESTC, attributeName=https://ontology.eglobalmark.com/apic#incoming, attributeType=Property, attributeValue…, withTemporalValues=false, withAudit=true, expectation=[
   {
      "@id": "urn:ngsi-ld:BeeHive:TESTC",
      "@type": [
         "https://ontology.eglobalmark.com/apic#BeeHive"
      ],
      "https://ontology.eglobalmark.com/apic#incoming": [
         {
            "@type": [
               "https://uri.etsi.org/ngsi-ld/Property"
            ],
            "https://uri.etsi.org/ngsi-ld/observedAt": [
               {
                  "@type": "https://uri.etsi.org/ngsi-ld/DateTime",
                  "@value": "2020-03-25T08:33:17.965206Z"
               }
…
com.egm.stellio.search.util.TemporalEntityBuilderTests ‑ [1] scopeHistory=[], attributeAndResultsMap={TemporalEntityAttribute(id=7db40689-c43a-47a8-9fed-a47df9a2c0ea, entityId=urn:ngsi-ld:BeeHive:TESTC, attributeName=https://ontology.eglobalmark.com/apic#incoming, attributeType=Property, attributeValueType=NUMBER, datasetId=null, createdAt=2024-03-23T10:58:30.288332262Z, modifiedAt=null, payload=JsonByteArrayInput{{}})=[FullAttributeInstanceResult(temporalEntityAttribute=ae561d03-4c9a-4ceb-ba70-7ff05e20e82c, payload={"@type":["https://uri.etsi.org/ngsi-ld/Property"],"https://uri.etsi.org/ngsi-ld/observedA…, withTemporalValues=false, withAudit=false, expectation={
  "@id": "urn:ngsi-ld:BeeHive:TESTC",
  "@type": [
    "https://ontology.eglobalmark.com/apic#BeeHive"
  ],
  "https://ontology.eglobalmark.com/apic#incoming": [
    {
      "@type": [
        "https://uri.etsi.org/ngsi-ld/Property"
      ],
      "https://uri.etsi.org/ngsi-ld/observedAt": [
        {
          "@type": "https://uri.etsi.org/ngsi-ld/DateTime",
          "@value": "2020-03-25T08:29:17.965206Z"
        }
      ],
      "https://uri.etsi.org/ngsi-ld/instanceId": [
        {
          "@id":…
com.egm.stellio.search.util.TemporalEntityBuilderTests ‑ [2] entityTemporalResults=[EntityTemporalResult(entityPayload=EntityPayload(entityId=urn:ngsi-ld:BeeHive:TESTC, types=[https://ontology.eglobalmark.com/apic#BeeHive], scopes=null, createdAt=2024-03-23T10:58:30.274561206Z, modifiedAt=null, payload=JsonByteArrayInput{{}}, specificAccessPolicy=null), scopeHistory=[], teaInstancesResult={TemporalEntityAttribute(id=c0ee40a8-9654-4a66-9626-d592015646d9, entityId=urn:ngsi-ld:BeeHive:TESTC, attributeName=https://ontology.eglobalmark.com/apic#incoming, attributeType=Property, attributeValue…, withTemporalValues=true, withAudit=false, expectation=[
  {
    "@id": "urn:ngsi-ld:BeeHive:TESTC",
    "@type": [
      "https://ontology.eglobalmark.com/apic#BeeHive"
    ],
    "https://ontology.eglobalmark.com/apic#incoming": [
      {
        "@type": [
          "https://uri.etsi.org/ngsi-ld/Property"
        ],
        "https://uri.etsi.org/ngsi-ld/hasValues": [
          {
            "@list": [
              {
                "@list": [
                  {
                    "@value": 20
                  },
                  {
                    "…
com.egm.stellio.search.util.TemporalEntityBuilderTests ‑ [2] scopeHistory=[], attributeAndResultsMap={TemporalEntityAttribute(id=4f5fb7e1-310e-431b-acda-894107e381bc, entityId=urn:ngsi-ld:BeeHive:TESTC, attributeName=https://ontology.eglobalmark.com/apic#incoming, attributeType=Relationship, attributeValueType=STRING, datasetId=null, createdAt=2024-03-23T10:58:30.288332262Z, modifiedAt=null, payload=JsonByteArrayInput{{}})=[FullAttributeInstanceResult(temporalEntityAttribute=afe40f86-0071-46db-b675-444d510119b9, payload={"@type":["https://uri.etsi.org/ngsi-ld/Relationship"],"https://uri.etsi.org/ngsi-ld/o…, withTemporalValues=false, withAudit=false, expectation={
  "@id": "urn:ngsi-ld:BeeHive:TESTC",
  "@type": [
    "https://ontology.eglobalmark.com/apic#BeeHive"
  ],
  "https://ontology.eglobalmark.com/apic#incoming": [
    {
      "@type": [
        "https://uri.etsi.org/ngsi-ld/Relationship"
      ],
      "https://uri.etsi.org/ngsi-ld/observedAt": [
        {
          "@type": "https://uri.etsi.org/ngsi-ld/DateTime",
          "@value": "2020-03-25T08:29:17.965206Z"
        }
      ],
      "https://uri.etsi.org/ngsi-ld/instanceId": [
        {
          "@…
com.egm.stellio.search.util.TemporalEntityBuilderTests ‑ [3] entityTemporalResults=[EntityTemporalResult(entityPayload=EntityPayload(entityId=urn:ngsi-ld:BeeHive:TESTC, types=[https://ontology.eglobalmark.com/apic#BeeHive], scopes=null, createdAt=2024-03-23T10:58:30.274561206Z, modifiedAt=null, payload=JsonByteArrayInput{{}}, specificAccessPolicy=null), scopeHistory=[], teaInstancesResult={TemporalEntityAttribute(id=add0aca7-8a87-4fcd-93d2-a7a8e9791969, entityId=urn:ngsi-ld:BeeHive:TESTC, attributeName=https://ontology.eglobalmark.com/apic#incoming, attributeType=Property, attributeValue…, withTemporalValues=true, withAudit=false, expectation=[
  {
    "@id": "urn:ngsi-ld:BeeHive:TESTC",
    "@type": [
      "https://ontology.eglobalmark.com/apic#BeeHive"
    ],
    "https://ontology.eglobalmark.com/apic#incoming": [
      {
        "@type": [
          "https://uri.etsi.org/ngsi-ld/Property"
        ],
        "https://uri.etsi.org/ngsi-ld/hasValues": [
          {
            "@list": [
              {
                "@list": [
                  {
                    "@value": 20
                  },
                  {
                    "…
…

♻️ This comment has been updated with latest results.

Copy link

@bobeal bobeal marked this pull request as ready for review March 15, 2024 07:08
@bobeal bobeal changed the title adding sysAttrs to notification params feat(subscription): add support for sysAttrs to notification params Mar 15, 2024
@bobeal bobeal added the subscription Relates to subscription API label Mar 15, 2024
@bobeal bobeal force-pushed the feature/add-sysAttrs branch from eb5ff46 to 4c2b3c7 Compare March 23, 2024 14:25
Copy link

@bobeal bobeal linked an issue Mar 23, 2024 that may be closed by this pull request
@bobeal bobeal merged commit f3518c0 into develop Mar 23, 2024
10 checks passed
@bobeal bobeal deleted the feature/add-sysAttrs branch March 23, 2024 14:39
@github-actions github-actions bot locked and limited conversation to collaborators Mar 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
feature New feature or request subscription Relates to subscription API
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for sysAttrs in notifications parameters
2 participants