Feature/tracefoss 617 upstream visiblity

backend/src/integration/groovy/org/eclipse/tractusx/traceability/common/support/AssetsSupport.groovy

@@ -21,15 +21,19 @@
 
 package org.eclipse.tractusx.traceability.common.support
 
+import net.bytebuddy.build.BuildLogger
 import org.eclipse.tractusx.traceability.assets.infrastructure.adapters.feign.irs.model.AssetsConverter
 import org.eclipse.tractusx.traceability.assets.infrastructure.adapters.jpa.asset.AssetEntity
 import org.eclipse.tractusx.traceability.infrastructure.jpa.investigation.InvestigationEntity
 import org.eclipse.tractusx.traceability.investigations.domain.model.InvestigationSide
 import org.eclipse.tractusx.traceability.investigations.domain.model.InvestigationStatus
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import java.time.Instant
 
 trait AssetsSupport implements AssetRepositoryProvider, InvestigationsRepositoryProvider {
+    private static final Logger logger = LoggerFactory.getLogger(AssetsSupport.class);
 
 	void defaultAssetsStored() {
 		assetRepository().saveAll(assetsConverter().readAndConvertAssets())
@@ -49,10 +53,13 @@ trait AssetsSupport implements AssetRepositoryProvider, InvestigationsRepository
                     asset.getCustomerPartId(),
                     asset.getManufacturingDate(),
                     asset.getManufacturingCountry(),
-                    asset.isSupplierPart(),
+                    asset.getOwner(),
                     asset.getChildDescriptions().stream()
                             .map(child -> new AssetEntity.ChildDescription(child.id(), child.idShort()))
                             .toList(),
+                    asset.getParentDescriptions().stream()
+                            .map(parent -> new AssetEntity.ParentDescription(parent.id(), parent.idShort()))
+                            .toList(),
                     asset.getQualityType(),
                     asset.getVan()
             )
@@ -72,6 +79,7 @@ trait AssetsSupport implements AssetRepositoryProvider, InvestigationsRepository
     }
 
 	void assertAssetsSize(int size) {
+        logger.info("Assetsize: " + assetRepository().countAssets());
 		assert assetRepository().countAssets() == size
 	}
 

backend/src/integration/groovy/org/eclipse/tractusx/traceability/common/support/IrsApiSupport.groovy

@@ -21,6 +21,7 @@
 
 package org.eclipse.tractusx.traceability.common.support
 
+import com.xebialabs.restito.builder.verify.VerifySequenced
 import org.glassfish.grizzly.http.util.HttpStatus
 import org.springframework.http.HttpHeaders
 
@@ -115,8 +116,8 @@ trait IrsApiSupport implements RestitoProvider {
 				ok(),
 				header("Content-Type", "application/json")
 			).withSequence(
-			jsonResponseFromFile("./stubs/irs/get/jobs/id/running_job_response_200.json"),
-			jsonResponseFromFile("./stubs/irs/get/jobs/id/response_200.json")
+			jsonResponseFromFile("./stubs/irs/get/jobs/id/response_200.json"),
+                jsonResponseFromFile("./stubs/irs/get/jobs/id/response_200.json")
 		)
 	}
 
@@ -147,6 +148,12 @@ trait IrsApiSupport implements RestitoProvider {
 		)
 	}
 
+    void verifyIrsApiTriggerJobCalledTimes(int times) {
+        verifyHttp(stubServer()).times(times,
+                post("/irs/jobs")
+        )
+    }
+
 	void verifyIrsApiTriggerJobNotCalled() {
 		verifyHttp(stubServer()).never(
 			post("/irs/jobs")

backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/model/Asset.java

@@ -23,6 +23,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
+import org.eclipse.tractusx.traceability.assets.infrastructure.adapters.feign.irs.model.Owner;
 
 import java.time.Instant;
 import java.util.List;
@@ -53,10 +54,11 @@ public final class Asset {
 	private final Instant manufacturingDate;
 	@ApiModelProperty(example = "DEU")
 	private final String manufacturingCountry;
-	@ApiModelProperty(example = "true")
-	private final boolean supplierPart;
+	@ApiModelProperty(example = "CUSTOMER")
+	private final Owner owner;
 
-	private List<ChildDescriptions> childDescriptions;
+	private List<Descriptions> childDescriptions;
+    private List<Descriptions> parentDescriptions;
 	@ApiModelProperty(example = "false")
 	private boolean underInvestigation;
 	@ApiModelProperty(example = "Ok")
@@ -77,8 +79,9 @@ public Asset(
 		String customerPartId,
 		Instant manufacturingDate,
 		String manufacturingCountry,
-		boolean supplierPart,
-		List<ChildDescriptions> childDescriptions,
+		Owner owner,
+		List<Descriptions> childDescriptions,
+        List<Descriptions> parentDescriptions,
 		boolean underInvestigation,
 		QualityType qualityType,
 		String van
@@ -95,8 +98,9 @@ public Asset(
 		this.customerPartId = customerPartId;
 		this.manufacturingDate = manufacturingDate;
 		this.manufacturingCountry = manufacturingCountry;
-		this.supplierPart = supplierPart;
+		this.owner = owner;
 		this.childDescriptions = childDescriptions;
+        this.parentDescriptions = parentDescriptions;
 		this.underInvestigation = underInvestigation;
 		this.qualityType = qualityType;
 		this.van = van;
@@ -150,18 +154,22 @@ public String getManufacturingCountry() {
 		return manufacturingCountry;
 	}
 
-	public boolean isSupplierPart() {
-		return supplierPart;
-	}
+    public Owner getOwner() {
+        return owner;
+    }
 
-	public String getPartInstanceId() {
+    public String getPartInstanceId() {
 		return partInstanceId;
 	}
 
-	public List<ChildDescriptions> getChildDescriptions() {
+	public List<Descriptions> getChildDescriptions() {
 		return childDescriptions;
 	}
 
+    public List<Descriptions> getParentDescriptions() {
+        return parentDescriptions;
+    }
+
 	public QualityType getQualityType() {
 		return qualityType;
 	}
@@ -170,7 +178,7 @@ public boolean isUnderInvestigation() {
 		return underInvestigation;
 	}
 
-	public record ChildDescriptions(
+	public record Descriptions(
 		@ApiModelProperty(example = "urn:uuid:a4a26b9c-9460-4cc5-8645-85916b86adb0") String id,
 		@ApiModelProperty(example = "null") String idShort) {
 	}

backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/ports/IrsRepository.java

@@ -22,9 +22,17 @@
 package org.eclipse.tractusx.traceability.assets.domain.ports;
 
 import org.eclipse.tractusx.traceability.assets.domain.model.Asset;
+import org.eclipse.tractusx.traceability.assets.infrastructure.adapters.feign.irs.model.Direction;
 
 import java.util.List;
 
 public interface IrsRepository {
-	List<Asset> findAssets(String globalAssetId);
+    /**
+     * Finds a list of assets with the given global asset ID and direction.
+     *
+     * @param globalAssetId the global asset ID to search for
+     * @param direction     the direction of the search
+     * @return a list of assets that match the given global asset ID and direction, or an empty list if no assets are found
+     */
+    List<Asset> findAssets(String globalAssetId, Direction direction);
 }

backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/service/AssetService.java

@@ -25,12 +25,14 @@
 import org.eclipse.tractusx.traceability.assets.domain.model.QualityType;
 import org.eclipse.tractusx.traceability.assets.domain.ports.AssetRepository;
 import org.eclipse.tractusx.traceability.assets.domain.ports.IrsRepository;
+import org.eclipse.tractusx.traceability.assets.infrastructure.adapters.feign.irs.model.Direction;
 import org.eclipse.tractusx.traceability.assets.infrastructure.config.async.AssetsAsyncConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -62,11 +64,13 @@ public void synchronizeAssets(String globalAssetId) {
 		logger.info("Synchronizing assets for globalAssetId: {}", globalAssetId);
 
 		try {
-			List<Asset> assets = irsRepository.findAssets(globalAssetId);
-
-			logger.info("Assets synchronization for globalAssetId: {} is done. Found {} assets. Saving them in the repository.", globalAssetId, assets.size());
-
-			assetRepository.saveAll(assets);
+			List<Asset> downwardAssets = irsRepository.findAssets(globalAssetId, Direction.DOWNWARD);
+            List<Asset> upwardAssets = irsRepository.findAssets(globalAssetId, Direction.UPWARD);
+            List<Asset> combinedAssetList = new ArrayList<>(upwardAssets);
+            combinedAssetList.addAll(downwardAssets);
+			logger.info("Assets synchronization for globalAssetId: {} is done. Found {} downwardAssets. Saving them in the repository.", globalAssetId, downwardAssets.size());
+            logger.info("Assets synchronization for globalAssetId: {} is done. Found {} upwardAssets. Saving them in the repository.", globalAssetId, upwardAssets.size());
+			assetRepository.saveAll(combinedAssetList);
 
 			logger.info("Assets for globalAssetId {} successfully saved.", globalAssetId);
 		} catch (Exception e) {
@@ -76,9 +80,7 @@ public void synchronizeAssets(String globalAssetId) {
 
 	public Asset updateQualityType(String assetId, QualityType qualityType) {
 		Asset foundAsset = assetRepository.getAssetById(assetId);
-
 		foundAsset.updateQualityType(qualityType);
-
 		return assetRepository.save(foundAsset);
 	}
 

backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/adapters/feign/irs/IrsService.java

@@ -25,6 +25,7 @@
 import org.eclipse.tractusx.traceability.assets.domain.ports.BpnRepository;
 import org.eclipse.tractusx.traceability.assets.domain.ports.IrsRepository;
 import org.eclipse.tractusx.traceability.assets.infrastructure.adapters.feign.irs.model.AssetsConverter;
+import org.eclipse.tractusx.traceability.assets.infrastructure.adapters.feign.irs.model.Direction;
 import org.eclipse.tractusx.traceability.assets.infrastructure.adapters.feign.irs.model.JobResponse;
 import org.eclipse.tractusx.traceability.assets.infrastructure.adapters.feign.irs.model.JobStatus;
 import org.eclipse.tractusx.traceability.assets.infrastructure.adapters.feign.irs.model.StartJobRequest;
@@ -52,8 +53,8 @@ public IrsService(IRSApiClient irsClient, AssetsConverter assetsConverter, BpnRe
     }
 
     @Override
-    public List<Asset> findAssets(String globalAssetId) {
-        StartJobResponse startJobResponse = irsClient.registerJob(StartJobRequest.forGlobalAssetId(globalAssetId));
+    public List<Asset> findAssets(String globalAssetId, Direction direction) {
+        StartJobResponse startJobResponse = irsClient.registerJob(StartJobRequest.buildJobRequest(globalAssetId, direction));
         JobResponse jobResponse = irsClient.getJobDetails(startJobResponse.id());
 
         JobStatus jobStatus = jobResponse.jobStatus();