diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/migration/M014_AddItemNameBescheidToPatchAttachedItemCommand.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/migration/M014_AddItemNameBescheidToPatchAttachedItemCommand.java index 576a6a65ccd89b1c7dc1fa266dd17706bc832a25..b119d8f189a676fd474dac70f2259b01ab4309f8 100644 --- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/migration/M014_AddItemNameBescheidToPatchAttachedItemCommand.java +++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/migration/M014_AddItemNameBescheidToPatchAttachedItemCommand.java @@ -25,13 +25,13 @@ package de.ozgcloud.vorgang.common.migration; import java.util.List; +import org.bson.Document; +import org.bson.types.ObjectId; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; -import de.ozgcloud.command.Command; -import de.ozgcloud.vorgang.command.PersistedCommand; import io.mongock.api.annotations.ChangeUnit; import io.mongock.api.annotations.Execution; import io.mongock.api.annotations.RollbackExecution; @@ -39,6 +39,7 @@ import io.mongock.api.annotations.RollbackExecution; @ChangeUnit(id = "2025-01-17 16:00:00 OZG-7515", order = "M014", author = "freichenbach", runAlways = true) public class M014_AddItemNameBescheidToPatchAttachedItemCommand { // NOSONAR + private static final String COMMAND_COLLECTION_NAME = "command"; private static final String ORDER_FIELD = "order"; private static final String SEND_BESCHEID_ORDER = "SEND_BESCHEID"; private static final String PARENT_ID_FIELD = "bodyObject.parentId"; @@ -53,8 +54,9 @@ public class M014_AddItemNameBescheidToPatchAttachedItemCommand { // NOSONAR } List<String> getSendBescheidCommandIds(MongoOperations mongoOperations) { - var commands = mongoOperations.find(Query.query(Criteria.where(ORDER_FIELD).is(SEND_BESCHEID_ORDER)), PersistedCommand.class); - return commands.stream().map(Command::getId).toList(); + var commands = mongoOperations.find(Query.query(Criteria.where(ORDER_FIELD).is(SEND_BESCHEID_ORDER)), Document.class, + COMMAND_COLLECTION_NAME); + return commands.stream().map(command -> command.getObjectId("_id")).map(ObjectId::toString).toList(); } private void updateDocuments(MongoOperations mongoOperations, List<String> parentIds) { @@ -63,7 +65,7 @@ public class M014_AddItemNameBescheidToPatchAttachedItemCommand { // NOSONAR Criteria.where(ORDER_FIELD).is(PATCH_ATTACHED_ITEM_ORDER), Criteria.where(ITEM_NAME_FILED).exists(false))); var update = new Update().set(ITEM_NAME_FILED, BESCHEID_ITEM_NAME); - mongoOperations.updateMulti(query, update, PersistedCommand.class); + mongoOperations.updateMulti(query, update, COMMAND_COLLECTION_NAME); } @RollbackExecution