Fix AAS Repo Tests

Author: FriedJannik

internal/aasrepository/persistence/aas_database.go

@@ -164,16 +164,21 @@ func (s *AssetAdministrationShellDatabase) appendAASHistoryTx(ctx context.Contex
 	return history.AppendVersionTx(ctx, tx, history.TableAAS, aas.ID(), changeType, snapshot, deleted)
 }
 
-func appendAASUpdatedHistoryByIdentifierTx(ctx context.Context, tx *sql.Tx, aasIdentifier string) error {
-	return history.AppendVersionTx(
-		ctx,
-		tx,
-		history.TableAAS,
-		aasIdentifier,
-		history.ChangeUpdated,
-		map[string]any{"id": aasIdentifier},
-		false,
-	)
+func (s *AssetAdministrationShellDatabase) appendAASUpdatedHistoryByIdentifierTx(ctx context.Context, tx *sql.Tx, aasIdentifier string) error {
+	aasDBID, err := persistenceutils.GetAssetAdministrationShellDatabaseID(tx, aasIdentifier)
+	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return common.NewErrNotFound("AASREPO-HISTORYUPDATED-AASNOTFOUND Asset Administration Shell with ID '" + aasIdentifier + "' not found")
+		}
+		return common.NewInternalServerError("AASREPO-HISTORYUPDATED-GETAASDBID " + err.Error())
+	}
+
+	aas, err := s.getAssetAdministrationShellMapByDBIDFromDB(ctx, tx, int64(aasDBID))
+	if err != nil {
+		return err
+	}
+
+	return s.appendAASHistoryTx(ctx, tx, aas, history.ChangeUpdated, false)
 }
 
 // GetSignedAssetAdministrationShell returns a compact JWS for the requested AAS.
@@ -513,7 +518,7 @@ func (s *AssetAdministrationShellDatabase) createSubmodelReferenceInAssetAdminis
 			return common.NewErrDenied("AASREPO-NEWSMREFINAAS-ABACDENIED written AAS is not accessible under ABAC constraints")
 		}
 	}
-	return appendAASUpdatedHistoryByIdentifierTx(ctx, tx, aasIdentifier)
+	return s.appendAASUpdatedHistoryByIdentifierTx(ctx, tx, aasIdentifier)
 }
 
 func (s *AssetAdministrationShellDatabase) getNextSubmodelReferencePositionInTransaction(tx *sql.Tx, aasDBID int64) (int, error) {
@@ -1081,7 +1086,7 @@ func (s *AssetAdministrationShellDatabase) PutAssetInformationByAASIDInTransacti
 	if err := s.ensureAASVisibleAfterAssetInformationUpdate(ctx, tx, aasIdentifier, shouldEnforce); err != nil {
 		return err
 	}
-	return appendAASUpdatedHistoryByIdentifierTx(ctx, tx, aasIdentifier)
+	return s.appendAASUpdatedHistoryByIdentifierTx(ctx, tx, aasIdentifier)
 }
 
 type currentAssetInformationState struct {
@@ -1322,7 +1327,7 @@ func (s *AssetAdministrationShellDatabase) PutThumbnailByAASID(ctx context.Conte
 	if uploadErr := thumbnailHandler.uploadThumbnailByAASIDInTransaction(tx, aasIdentifier, fileName, file); uploadErr != nil {
 		return uploadErr
 	}
-	if err := appendAASUpdatedHistoryByIdentifierTx(ctx, tx, aasIdentifier); err != nil {
+	if err := s.appendAASUpdatedHistoryByIdentifierTx(ctx, tx, aasIdentifier); err != nil {
 		return err
 	}
 
@@ -1367,7 +1372,7 @@ func (s *AssetAdministrationShellDatabase) DeleteThumbnailByAASID(ctx context.Co
 	if deleteErr := thumbnailHandler.deleteThumbnailByAASIDInTransaction(tx, aasIdentifier); deleteErr != nil {
 		return deleteErr
 	}
-	if err := appendAASUpdatedHistoryByIdentifierTx(ctx, tx, aasIdentifier); err != nil {
+	if err := s.appendAASUpdatedHistoryByIdentifierTx(ctx, tx, aasIdentifier); err != nil {
 		return err
 	}
 
@@ -1625,7 +1630,7 @@ func (s *AssetAdministrationShellDatabase) deleteSubmodelReferenceInAssetAdminis
 	if err := s.deleteSubmodelReferenceInAssetAdministrationShellInTransaction(tx, aasIdentifier, submodelIdentifier); err != nil {
 		return err
 	}
-	return appendAASUpdatedHistoryByIdentifierTx(ctx, tx, aasIdentifier)
+	return s.appendAASUpdatedHistoryByIdentifierTx(ctx, tx, aasIdentifier)
 }
 
 // deleteSubmodelReferenceInAssetAdministrationShellInTransaction removes a submodel reference within an existing transaction.
@@ -1684,6 +1689,10 @@ type coreAssetAdministrationShellRow struct {
 // nolint:revive // cyclomatic complexity of 32
 // getAssetAdministrationShellMapByDBID loads an AAS and maps it to a typed model.
 func (s *AssetAdministrationShellDatabase) getAssetAdministrationShellMapByDBID(ctx context.Context, aasDBID int64) (types.IAssetAdministrationShell, error) {
+	return s.getAssetAdministrationShellMapByDBIDFromDB(ctx, s.db, aasDBID)
+}
+
+func (s *AssetAdministrationShellDatabase) getAssetAdministrationShellMapByDBIDFromDB(ctx context.Context, db descriptors.DBQueryer, aasDBID int64) (types.IAssetAdministrationShell, error) {
 	dialect := goqu.Dialect("postgres")
 	querySQL, queryArgs, buildErr := buildGetAssetAdministrationShellMapByDBIDQuery(&dialect, aasDBID)
 	if buildErr != nil {
@@ -1692,7 +1701,7 @@ func (s *AssetAdministrationShellDatabase) getAssetAdministrationShellMapByDBID(
 
 	var row coreAssetAdministrationShellRow
 
-	if queryErr := s.db.QueryRow(querySQL, queryArgs...).Scan(
+	if queryErr := db.QueryRowContext(ctx, querySQL, queryArgs...).Scan(
 		&row.aasID,
 		&row.idShort,
 		&row.category,
@@ -1714,12 +1723,12 @@ func (s *AssetAdministrationShellDatabase) getAssetAdministrationShellMapByDBID(
 		return nil, common.NewInternalServerError("AASREPO-MAPAAS-EXECSQL " + queryErr.Error())
 	}
 
-	specificAssetIDs, specificErr := s.readSpecificAssetIDsByAssetInformationID(ctx, aasDBID)
+	specificAssetIDs, specificErr := s.readSpecificAssetIDsByAssetInformationIDFromDB(ctx, db, aasDBID)
 	if specificErr != nil {
 		return nil, common.NewInternalServerError("AASREPO-MAPAAS-READSPECIFICASSETIDS " + specificErr.Error())
 	}
 
-	submodelsByAASID, submodelErr := s.readSubmodelReferencePayloadsByAASDBIDs(ctx, []int64{aasDBID})
+	submodelsByAASID, submodelErr := s.readSubmodelReferencePayloadsByAASDBIDsFromDB(ctx, db, []int64{aasDBID})
 	if submodelErr != nil {
 		return nil, submodelErr
 	}
@@ -1809,6 +1818,10 @@ func (s *AssetAdministrationShellDatabase) getAssetAdministrationShellMapsByDBID
 }
 
 func (s *AssetAdministrationShellDatabase) readSubmodelReferencePayloadsByAASDBIDs(ctx context.Context, aasDBIDs []int64) (map[int64][]types.IReference, error) {
+	return s.readSubmodelReferencePayloadsByAASDBIDsFromDB(ctx, s.db, aasDBIDs)
+}
+
+func (s *AssetAdministrationShellDatabase) readSubmodelReferencePayloadsByAASDBIDsFromDB(ctx context.Context, db descriptors.DBQueryer, aasDBIDs []int64) (map[int64][]types.IReference, error) {
 	out := make(map[int64][]types.IReference, len(aasDBIDs))
 	if len(aasDBIDs) == 0 {
 		return out, nil
@@ -1820,7 +1833,7 @@ func (s *AssetAdministrationShellDatabase) readSubmodelReferencePayloadsByAASDBI
 		return nil, common.NewInternalServerError("AASREPO-READSMREFBATCH-BUILDSQL " + submodelBuildErr.Error())
 	}
 
-	rows, submodelQueryErr := s.db.QueryContext(ctx, submodelSQL, submodelArgs...)
+	rows, submodelQueryErr := db.QueryContext(ctx, submodelSQL, submodelArgs...)
 	if submodelQueryErr != nil {
 		return nil, common.NewInternalServerError("AASREPO-READSMREFBATCH-EXECSQL " + submodelQueryErr.Error())
 	}
@@ -2137,15 +2150,14 @@ func parseSpecificAssetIDSemanticIDPayload(payload []byte) (types.IReference, bo
 	return parsedReference, true, nil
 }
 
-// readSpecificAssetIDsByAssetInformationID reads and enriches specificAssetIds for an assetInformation record.
-func (s *AssetAdministrationShellDatabase) readSpecificAssetIDsByAssetInformationID(ctx context.Context, assetInformationID int64) ([]types.ISpecificAssetID, error) {
+func (s *AssetAdministrationShellDatabase) readSpecificAssetIDsByAssetInformationIDFromDB(ctx context.Context, db descriptors.DBQueryer, assetInformationID int64) ([]types.ISpecificAssetID, error) {
 	dialect := goqu.Dialect("postgres")
 	querySQL, queryArgs, buildErr := buildReadSpecificAssetIDsByAssetInformationIDQuery(&dialect, assetInformationID)
 	if buildErr != nil {
 		return nil, common.NewInternalServerError("AASREPO-READSPECIFIC-BUILDSQL " + buildErr.Error())
 	}
 
-	rows, queryErr := s.db.QueryContext(ctx, querySQL, queryArgs...)
+	rows, queryErr := db.QueryContext(ctx, querySQL, queryArgs...)
 	if queryErr != nil {
 		return nil, common.NewInternalServerError("AASREPO-READSPECIFIC-EXECSQL " + queryErr.Error())
 	}
@@ -2178,12 +2190,12 @@ func (s *AssetAdministrationShellDatabase) readSpecificAssetIDsByAssetInformatio
 		return []types.ISpecificAssetID{}, nil
 	}
 
-	externalSubjectByID, extErr := descriptors.ReadSpecificAssetExternalSubjectReferencesBySpecificAssetIDs(ctx, s.db, ids)
+	externalSubjectByID, extErr := descriptors.ReadSpecificAssetExternalSubjectReferencesBySpecificAssetIDs(ctx, db, ids)
 	if extErr != nil {
 		return nil, extErr
 	}
 
-	supplementalByID, suppErr := descriptors.ReadSpecificAssetSupplementalSemanticReferencesBySpecificAssetIDs(ctx, s.db, ids)
+	supplementalByID, suppErr := descriptors.ReadSpecificAssetSupplementalSemanticReferencesBySpecificAssetIDs(ctx, db, ids)
 	if suppErr != nil {
 		return nil, suppErr
 	}