Skip to content

Commit

Permalink
Merge pull request #435 from ScorpioBroker/bugfix-createdat
Browse files Browse the repository at this point in the history 
Bugfix-430
  • Loading branch information
@ScorpioBroker
ScorpioBroker committed Sep 1, 2023
2 parents e6de226 + 8c739c1 commit b87710a
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 22 deletions.
56 changes: 56 additions & 0 deletions AllInOneRunner/src/main/resources/db/migration/V20230822.1__bugfix_createdat.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
CREATE OR REPLACE FUNCTION NGSILD_PARTIALUPDATE(ENTITY jsonb, attribName text, attribValues jsonb) RETURNS jsonb AS $ENTITYPU$
declare
tmp jsonb;
datasetId text;
insertDatasetId text;
originalEntry jsonb;
insertEntry jsonb;
inUpdate boolean;
BEGIN
tmp := '[]'::jsonb;
FOR originalEntry IN SELECT jsonb_array_elements FROM jsonb_array_elements(ENTITY->attribName) LOOP
inUpdate := False;
datasetId := originalEntry #>> '{https://uri.etsi.org/ngsi-ld/datasetId,0,@id}';
FOR insertEntry IN SELECT jsonb_array_elements FROM jsonb_array_elements(attribValues) LOOP
insertDatasetId := insertEntry #>> '{https://uri.etsi.org/ngsi-ld/datasetId,0,@id}';
IF (insertDatasetId is null and datasetId is null)or (insertDatasetId is not null and datasetId is not null and insertDatasetId = datasetId) THEN
inUpdate = true;
EXIT;
END IF;
END LOOP;
IF NOT inUpdate THEN
tmp := tmp || originalEntry;
END IF;
END LOOP;
tmp := tmp || attribValues;
IF not attribValues ? 'https://uri.etsi.org/ngsi-ld/modifiedAt' THEN
Entity := jsonb_set(Entity,Array['https://uri.etsi.org/ngsi-ld/modifiedAt','0'],jsonb_build_object('@type', 'https://uri.etsi.org/ngsi-ld/DateTime','@value', to_char(timezone('utc', now()), 'YYYY-MM-DD"T"HH24:MI:SS') || 'Z'));
tmp := jsonb_set(tmp,Array['0','https://uri.etsi.org/ngsi-ld/modifiedAt'], Entity->'https://uri.etsi.org/ngsi-ld/modifiedAt',true);
END IF;
RETURN jsonb_set(Entity,Array[attribName,'0'], (Entity->attribName->0) || (tmp->0),true);
END;
$ENTITYPU$ LANGUAGE PLPGSQL;


CREATE OR REPLACE FUNCTION NGSILD_DELETEATTRIB(ENTITY jsonb, attribName text, deleteDatasetId text) RETURNS jsonb AS $ENTITYPD$
declare
tmp jsonb;
datasetId text;
originalEntry jsonb;
BEGIN
tmp := '[]'::jsonb;
FOR originalEntry IN SELECT jsonb_array_elements FROM jsonb_array_elements(ENTITY->attribName) LOOP
datasetId := originalEntry #>> '{https://uri.etsi.org/ngsi-ld/datasetId,0,@id}';
IF NOT ((deleteDatasetId is null and datasetId is null)or (deleteDatasetId is not null and datasetId is not null and deleteDatasetId = datasetId)) THEN
tmp := tmp || originalEntry;
END IF;
END LOOP;
IF jsonb_array_length(tmp) > 0 THEN
Entity := jsonb_set(Entity,Array['https://uri.etsi.org/ngsi-ld/modifiedAt','0'],jsonb_build_object('@type', 'https://uri.etsi.org/ngsi-ld/DateTime','@value', to_char(timezone('utc', now()), 'YYYY-MM-DD"T"HH24:MI:SS') || 'Z'));
RETURN jsonb_set(ENTITY,'{attribName}', tmp);
ELSE
Entity := jsonb_set(Entity,Array['https://uri.etsi.org/ngsi-ld/modifiedAt','0'],jsonb_build_object('@type', 'https://uri.etsi.org/ngsi-ld/DateTime','@value', to_char(timezone('utc', now()), 'YYYY-MM-DD"T"HH24:MI:SS') || 'Z'));
RETURN ENTITY - attribName;
END IF;
END;
$ENTITYPD$ LANGUAGE PLPGSQL;
71 changes: 49 additions & 22 deletions EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/services/EntityInfoDAO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ public Uni<RowSet<Row>> partialUpdateAttribute(UpdateEntityRequest request) {
return clientManager.getClient(request.getTenant(), false).onItem().transformToUni(client -> {
Object objPayload = request.getPayload().get(request.getAttrName());
Tuple tuple;
if (objPayload instanceof List<?> payloads) {
tuple = Tuple.of(request.getAttrName(), new JsonArray(payloads), request.getId());
List<Object> payloads = new ArrayList<>();
if (objPayload instanceof List<?> ) {
payloads = (List<Object>) objPayload;
} else {
List<Object> payloads = new ArrayList<>();
payloads.add(objPayload);
tuple = Tuple.of(request.getAttrName(), new JsonArray(payloads), request.getId());
}
// String sql = "UPDATE ENTITY SET ENTITY = NGSILD_PARTIALUPDATE(ENTITY, $1, $2) WHERE id=$3 AND ENTITY ? $1 RETURNING ENTITY";
((Map<String,Object>)payloads.get(0)).remove(NGSIConstants.NGSI_LD_CREATED_AT);
tuple = Tuple.of(request.getAttrName(), new JsonArray(payloads), request.getId());
String sql = """
WITH old_entity AS (
SELECT ENTITY
Expand Down Expand Up @@ -245,16 +245,28 @@ WITH old_entity AS (
FROM ENTITY
WHERE ID = '%s'
)""".formatted(request.getId());

sql+= """
,json_data AS (
SELECT jsonb_strip_nulls(jsonb_object_agg(
key,
CASE
WHEN jsonb_typeof(value->0) = 'object' and (value->0)?'https://uri.etsi.org/ngsi-ld/createdAt' THEN
jsonb_set(value, '{0,https://uri.etsi.org/ngsi-ld/createdAt}', old_entity.entity->key->0->'https://uri.etsi.org/ngsi-ld/createdAt', true)
ELSE
value
END
)) AS modified_data
FROM JSONB_EACH($1::jsonb)
CROSS JOIN old_entity
)""";
tuple.addJsonObject(new JsonObject(payload));
sql += " UPDATE ENTITY SET ";
if (types != null) {
sql += "e_types = ARRAY(SELECT DISTINCT UNNEST(e_types || $1)), ENTITY = (jsonb_set(ENTITY, '{@type}', array_to_json(e_types)::jsonb) || $2)";
sql += "e_types = ARRAY(SELECT DISTINCT UNNEST(e_types || $2)), ENTITY = (jsonb_set(ENTITY, '{@type}', array_to_json(e_types)::jsonb) || (select * from json_data)-'https://uri.etsi.org/ngsi-ld/createdAt')";
dollar = 3;
tuple.addArrayOfString(((List<String>) types).toArray(new String[0]));
tuple.addJsonObject(new JsonObject(payload));
} else {
sql += " ENTITY = (ENTITY || $1) ";
tuple.addJsonObject(new JsonObject(payload));
sql += " ENTITY = (ENTITY || (select * from json_data)-'https://uri.etsi.org/ngsi-ld/createdAt') ";
}
if (!toBeRemoved.isEmpty()) {
for (String remove : toBeRemoved) {
Expand Down Expand Up @@ -332,19 +344,19 @@ public Uni<Set<String>> appendToEntity2(AppendEntityRequest request, boolean noO
if (types != null) {
sql += "e_types = ARRAY(SELECT DISTINCT UNNEST(e_types || $1)), ";
if (noOverwrite) {
sql += "ENTITY = ($2 || jsonb_set(ENTITY, '{@type}', array_to_json(e_types)::jsonb))";
sql += "ENTITY = (($2::jsonb - 'https://uri.etsi.org/ngsi-ld/createdAt') || jsonb_set(ENTITY, '{@type}', array_to_json(e_types)::jsonb))";
} else {
sql += "ENTITY = (jsonb_set(ENTITY, '{@type}', array_to_json(e_types)::jsonb) || $2)";
sql += "ENTITY = (jsonb_set(ENTITY, '{@type}', array_to_json(e_types)::jsonb) || ($2::jsonb - 'https://uri.etsi.org/ngsi-ld/createdAt'))";
}

dollar = 3;
tuple.addArrayOfString(((List<String>) types).toArray(new String[0]));
tuple.addJsonObject(new JsonObject(payload));
} else {
if (noOverwrite) {
sql += " ENTITY = ($1 || ENTITY) ";
sql += " ENTITY = (($1::jsonb - 'https://uri.etsi.org/ngsi-ld/createdAt') || ENTITY) ";
} else {
sql += " ENTITY = (ENTITY || $1) ";
sql += " ENTITY = (ENTITY || ($1::jsonb - 'https://uri.etsi.org/ngsi-ld/createdAt')) ";
}
tuple.addJsonObject(new JsonObject(payload));
}
Expand Down Expand Up @@ -381,6 +393,7 @@ public Uni<Map<String, Object>> deleteEntity(DeleteEntityRequest request) {
public Uni<Map<String,Object>> mergePatch(MergePatchRequest request) {
return clientManager.getClient(request.getTenant(), false).onItem().transformToUni(client -> {
Map<String,Object> payload = request.getPayload();
payload.remove(NGSIConstants.NGSI_LD_CREATED_AT);
if(payload.get(JsonLdConsts.TYPE) == null) payload.remove(JsonLdConsts.TYPE);
return client.preparedQuery("SELECT * FROM MERGE_JSON($1,$2)")
.execute(Tuple.of(request.getId(), new JsonObject(request.getPayload())))
Expand All @@ -403,12 +416,19 @@ public Uni<Map<String, Object>> replaceEntity(ReplaceEntityRequest request) {
String[] types = ((List<String>) request.getPayload().get(NGSIConstants.JSON_LD_TYPE)).toArray(new String[0]);
return clientManager.getClient(request.getTenant(), false).onItem().transformToUni(client -> {
return client.preparedQuery("""
WITH old_entity AS (
SELECT ENTITY
FROM ENTITY
WHERE id = $3)
update entity set entity = jsonb_build_object('https://uri.etsi.org/ngsi-ld/createdAt' , entity->'https://uri.etsi.org/ngsi-ld/createdAt') || $1::jsonb, e_types = $2 where id = $3
RETURNING (SELECT ENTITY FROM old_entity) AS old_entity""")
WITH old_entity AS (
SELECT ENTITY
FROM ENTITY
WHERE id = $3),
json_data AS (
SELECT jsonb_strip_nulls(jsonb_object_agg(
key,
CASE WHEN jsonb_typeof(value->0) = 'object' and (value->0)?'https://uri.etsi.org/ngsi-ld/createdAt' THEN
jsonb_set(value, '{0,https://uri.etsi.org/ngsi-ld/createdAt}', old_entity.entity->key->0->'https://uri.etsi.org/ngsi-ld/createdAt', true)
ELSE value
END )) FROM JSONB_EACH($1::jsonb) CROSS JOIN old_entity )
update entity set entity = (select * from json_data) || jsonb_build_object('https://uri.etsi.org/ngsi-ld/createdAt' , entity->'https://uri.etsi.org/ngsi-ld/createdAt') , e_types = $2 where id = $3
RETURNING (SELECT ENTITY FROM old_entity) AS old_entity""")
.execute(Tuple.of(new JsonObject(request.getPayload()),types,request.getId())).onItem().transformToUni(rows -> {
if (rows.rowCount() == 0) {
return Uni.createFrom().failure(new ResponseException(ErrorType.NotFound));
Expand All @@ -428,9 +448,16 @@ WITH old_entity AS (
SELECT ENTITY
FROM ENTITY
WHERE id = $2
)
),
json_data AS (
SELECT jsonb_strip_nulls(jsonb_object_agg(
key,
CASE WHEN jsonb_typeof(value->0) = 'object' and (value->0)?'https://uri.etsi.org/ngsi-ld/createdAt' THEN
jsonb_set(value, '{0,https://uri.etsi.org/ngsi-ld/createdAt}', old_entity.entity->key->0->'https://uri.etsi.org/ngsi-ld/createdAt', true)
ELSE value
END )) FROM JSONB_EACH($1::jsonb) CROSS JOIN old_entity )
UPDATE entity
SET entity = entity::jsonb || $1
SET entity = entity::jsonb || ((select * from json_data) - 'https://uri.etsi.org/ngsi-ld/createdAt')
WHERE id = $2
AND ENTITY ? $3
AND (ENTITY-> $3 )::jsonb->$4 IS NULL
Expand Down

0 comments on commit b87710a

Please sign in to comment.