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.

Sign up for GitHub

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

fix: item stock exchange #753

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: item stock exchange #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92c47e2
fix: item stock exchange
ReneSchroederLJ Jan 27, 2025
e3ab120
fix: tests
ReneSchroederLJ Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions ...main/java/org/eclipse/tractusx/puris/backend/stock/logic/adapter/ItemStockSammMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,24 +170,25 @@ public List<ProductItemStock> erpSammToProductItemStock(ItemStockSamm samm, Part
public List<ReportedProductItemStock> itemStockSammToReportedProductItemStock(ItemStockSamm samm, Partner partner) {
String matNbrCatenaX = samm.getMaterialGlobalAssetId();
ArrayList<ReportedProductItemStock> outputList = new ArrayList<>();
if (samm.getDirection() != DirectionCharacteristic.INBOUND) {
throw new IllegalArgumentException("Direction should be INBOUND, aborting");
if (samm.getDirection() != DirectionCharacteristic.OUTBOUND) {
throw new IllegalArgumentException("Direction should be OUTBOUND, aborting");
}

// When deserializing a Samm from a customer, who has sent a report on the
// stocks he received from us, the materialGlobalAssetId used in the communication
// was set by us (as the supplying side). Therefore the materialGlobalAssetId in
// the Samm is the one in our Material entity.
Material material = materialService.findByMaterialNumberCx(matNbrCatenaX);
if (material == null) {
throw new IllegalArgumentException("Could not identify material with CatenaXNbr " + matNbrCatenaX);
}
var mpr = mprService.findByPartnerAndPartnerCXNumber(partner, matNbrCatenaX);

var mpr = mprService.find(material, partner);
if (mpr == null) {
throw new IllegalArgumentException("Could not identify materialPartnerRelation with matNbrCatenaX "
+ matNbrCatenaX + " and partner bpnl " + partner.getBpnl());
}
// When deserializing a Samm from a supplier, who has sent a report on the
// stocks he has prepared for us, the materialGlobalAssetId used in the communication
// was set by the supplying partner. Therefore, the materialGlobalAssetId in
// the Samm is the one in our MaterialPartnerRelation entity with that partner.
Material material = mpr.getMaterial();
if (material == null) {
throw new IllegalArgumentException("Could not identify material with CatenaXNbr " + matNbrCatenaX);
}


for (var position : samm.getPositions()) {
String supplierOrderId = null, customerOrderPositionId = null, customerOrderId = null;
Expand Down Expand Up @@ -220,23 +221,24 @@ public List<ReportedProductItemStock> itemStockSammToReportedProductItemStock(It
public List<ReportedMaterialItemStock> itemStockSammToReportedMaterialItemStock(ItemStockSamm samm, Partner partner) {
String matNbrCatenaX = samm.getMaterialGlobalAssetId();
ArrayList<ReportedMaterialItemStock> outputList = new ArrayList<>();
if (samm.getDirection() != DirectionCharacteristic.OUTBOUND) {
throw new IllegalArgumentException("Direction should be OUTBOUND, aborting");
if (samm.getDirection() != DirectionCharacteristic.INBOUND) {
throw new IllegalArgumentException("Direction should be INBOUND, aborting");
}
var mpr = mprService.findByPartnerAndPartnerCXNumber(partner, matNbrCatenaX);

// When deserializing a Samm from a customer, who has sent a report on the
// stocks he received from us, the materialGlobalAssetId used in the communication
// was set by us (as the supplying side). Therefore the materialGlobalAssetId in
// the Samm is the one in our Material entity.
Material material = materialService.findByMaterialNumberCx(matNbrCatenaX);
if (material == null) {
throw new IllegalArgumentException("Could not identify material with CatenaXNbr " + matNbrCatenaX);
}

var mpr = mprService.find(material, partner);
if (mpr == null) {
throw new IllegalArgumentException("Could not identify materialPartnerRelation with matNbrCatenaX "
+ matNbrCatenaX + " and partner bpnl " + partner.getBpnl());
}
// When deserializing a Samm from a supplier, who has sent a report on the
// stocks he has prepared for us, the materialGlobalAssetId used in the communication
// was set by the supplying partner. Therefore, the materialGlobalAssetId in
// the Samm is the one in our MaterialPartnerRelation entity with that partner.
Material material = mpr.getMaterial();
if (material == null) {
throw new IllegalArgumentException("Could not identify material with CatenaXNbr " + matNbrCatenaX);
}

for (var position : samm.getPositions()) {
String supplierOrderId = null, customerOrderPositionId = null, customerOrderId = null;
Expand Down
4 changes: 2 additions & 2 deletions ...va/org/eclipse/tractusx/puris/backend/stock/logic/service/ItemStockRequestApiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public ItemStockSamm handleItemStockSubmodelRequest(String bpnl, String material
public void doItemStockSubmodelReportedMaterialItemStockRequest(Partner partner, Material material) {
try {
var mpr = mprService.find(material, partner);
var data = edcAdapterService.doSubmodelRequest(AssetType.ITEM_STOCK_SUBMODEL, mpr, DirectionCharacteristic.OUTBOUND, 1);
var data = edcAdapterService.doSubmodelRequest(AssetType.ITEM_STOCK_SUBMODEL, mpr, DirectionCharacteristic.INBOUND, 1);
var samm = objectMapper.treeToValue(data, ItemStockSamm.class);
var stocks = sammMapper.itemStockSammToReportedMaterialItemStock(samm, partner);
for (var stock : stocks) {
Expand Down Expand Up @@ -159,7 +159,7 @@ public void doItemStockSubmodelReportedProductItemStockRequest(Partner partner,
mprService.triggerPartTypeRetrievalTask(partner);
mpr = mprService.find(material, partner);
}
var data = edcAdapterService.doSubmodelRequest(AssetType.ITEM_STOCK_SUBMODEL ,mpr, DirectionCharacteristic.INBOUND, 1);
var data = edcAdapterService.doSubmodelRequest(AssetType.ITEM_STOCK_SUBMODEL ,mpr, DirectionCharacteristic.OUTBOUND, 1);
var samm = objectMapper.treeToValue(data, ItemStockSamm.class);
var stocks = sammMapper.itemStockSammToReportedProductItemStock(samm, partner);
for (var stock : stocks) {
Expand Down
77 changes: 40 additions & 37 deletions .../java/org/eclipse/tractusx/puris/backend/stock/logic/adapter/ItemStockSammMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.eclipse.tractusx.puris.backend.masterdata.logic.service.MaterialService;
import org.eclipse.tractusx.puris.backend.stock.domain.model.ItemStock;
import org.eclipse.tractusx.puris.backend.stock.domain.model.MaterialItemStock;
import org.eclipse.tractusx.puris.backend.stock.domain.model.ReportedProductItemStock;
import org.eclipse.tractusx.puris.backend.stock.domain.model.ReportedMaterialItemStock;
import org.eclipse.tractusx.puris.backend.stock.logic.dto.itemstocksamm.*;
import org.junit.jupiter.api.*;
import org.junit.platform.commons.logging.Logger;
Expand Down Expand Up @@ -172,30 +172,30 @@ void map_WhenSingleMaterialItemStock_ReturnsItemStockSamm() {
/**
* Tests following Scenario: Supplier asks the Customer for Stocks of a given material that the customer
* has in place and has been supplied by the Supplier earlier. The supplier receives the INBOUND ItemStockSAMM and
* maps it to the ReportedProductItemStock.
* maps it to the ReportedMaterialItemStock.
*
* In technical terms, this means the following:
* <li>Given: Create INBOUND ItemStock to represent the Stock level on Customer side</li>
* <li>When: Use mapper to create the ReportedProductItemStock</li>
* <li>When: Use mapper to create the ReportedMaterialsItemStock</li>
* <li>Then: Validate the Mappings</li>
*
* Note: The test brings fills the {@code SAMM_FROM_CUSTOMER_PARTNER}.
*/
@Test
@Order(2)
void map_WhenReportedSammToProductItemStock_ReturnsMultipleReportedProductItemStock() {
// If we want to map a Samm to a ProductItemStock entity, then this implies
void map_WhenReportedSammToMaterialItemStock_ReturnsMultipleReportedMaterialItemStock() {
// If we want to map a Samm to aMaterialItemStock entity, then this implies
// that we are the supplier, who has received a Samm from his customer partner.
// That customer partner therefore would have generated the Samm from his
// MaterialEntityStock entities.
// Since from the customer's point of view, the items he received from his supplier
// are INBOUND, then we have to set the DirectionCharacteristic accordingly.

// Given
ItemStockSamm inboundProductStockSamm = new ItemStockSamm();
ItemStockSamm inboundMaterialStockSamm = new ItemStockSamm();

inboundProductStockSamm.setDirection(DirectionCharacteristic.INBOUND);
inboundProductStockSamm.setMaterialGlobalAssetId(CX_MAT_NUMBER);
inboundMaterialStockSamm.setDirection(DirectionCharacteristic.INBOUND);
inboundMaterialStockSamm.setMaterialGlobalAssetId(CX_MAT_NUMBER);

// first position
Position anonymousPosition = new Position();
Expand Down Expand Up @@ -262,7 +262,7 @@ void map_WhenReportedSammToProductItemStock_ReturnsMultipleReportedProductItemSt
OPR_REF_CUSTOMER_POS_ID
));

inboundProductStockSamm.setPositions(Set.of(anonymousPosition, positionWithOrderPositionReference));
inboundMaterialStockSamm.setPositions(Set.of(anonymousPosition, positionWithOrderPositionReference));

Site site2 = new Site(SUPPLIER_BPNS2, "Site 2", SUPPLIER_BPNA2, "Test Street 2", "44174 Dortmund", "Germany");

Expand All @@ -282,29 +282,32 @@ void map_WhenReportedSammToProductItemStock_ReturnsMultipleReportedProductItemSt
MaterialPartnerRelation mpr = new MaterialPartnerRelation();
mpr.setPartner(customerPartner);
mpr.setMaterial(semiconductorProduct);
mpr.setPartnerBuysMaterial(false);
mpr.setPartnerSuppliesMaterial(true);
mpr.setPartnerBuysMaterial(true);
mpr.setPartnerSuppliesMaterial(false);
mpr.setPartnerMaterialNumber(CUSTOMER_MAT_NUMBER);

// When
// Find material based on CX number and mpr
when(mprService.find(semiconductorProduct, customerPartner)).thenReturn(mpr);
// Find material based on CX number
when(materialService.findByMaterialNumberCx(CX_MAT_NUMBER)).thenReturn(semiconductorProduct);

// Then we should build 5 reported product stocks:
// When
// Find MPR based on material and partner
when(mprService.find(semiconductorProduct, customerPartner)).thenReturn(mpr);

// Then we should build 5 reported material item stocks:
// - no OrderPositionReference (OPR), blocked, 10 pieces, BPNS & BPNA
// - no OPR, not blocked, 20 kilo, BPNS2 & BPNA2
// - no OPR, not blocked, 20 kilo, BPNS & BPNA
// - OPR, blocked, 10 pieces, BPNS & BPNA
// - OPR, not blocked, 20 kilo, BPNS & BPNA
List<ReportedProductItemStock> reportedProductItemStocks = itemStockSammMapper.itemStockSammToReportedProductItemStock(inboundProductStockSamm, customerPartner);
List<ReportedMaterialItemStock> reportedMaterialItemStocks = itemStockSammMapper.itemStockSammToReportedMaterialItemStock(inboundMaterialStockSamm, customerPartner);
// Then
assertEquals(5, reportedProductItemStocks.size());
assertEquals(5, reportedMaterialItemStocks.size());

// 1. anonymous stocks
// Check for stockBlocked
List<? extends ItemStock> potentialBlockedAnonymousStock = filterReportedItemStock(
reportedProductItemStocks,
reportedMaterialItemStocks,
stockBlocked,
anonymousPosition,
CX_MAT_NUMBER
Expand All @@ -313,14 +316,14 @@ void map_WhenReportedSammToProductItemStock_ReturnsMultipleReportedProductItemSt
assertEquals(1, potentialBlockedAnonymousStock.size());

// Test that the anonymous stock has null values (not empty strings)
ReportedProductItemStock reportedProductItemStock = (ReportedProductItemStock) potentialBlockedAnonymousStock.get(0);
assertNull(reportedProductItemStock.getCustomerOrderId());
assertNull(reportedProductItemStock.getSupplierOrderId());
assertNull(reportedProductItemStock.getCustomerOrderPositionId());
ReportedMaterialItemStock reportedMaterialItemStock = (ReportedMaterialItemStock) potentialBlockedAnonymousStock.get(0);
assertNull(reportedMaterialItemStock.getCustomerOrderId());
assertNull(reportedMaterialItemStock.getSupplierOrderId());
assertNull(reportedMaterialItemStock.getCustomerOrderPositionId());

// Check for stockNOTBlocked
List<? extends ItemStock> potentialNotBlockedAnonymousStock = filterReportedItemStock(
reportedProductItemStocks,
reportedMaterialItemStocks,
stockNotBlocked,
anonymousPosition,
CX_MAT_NUMBER
Expand All @@ -330,7 +333,7 @@ void map_WhenReportedSammToProductItemStock_ReturnsMultipleReportedProductItemSt

// Check for stockBlocked
List<? extends ItemStock> potentialAnonymousStockOtherSite = filterReportedItemStock(
reportedProductItemStocks,
reportedMaterialItemStocks,
stockOtherSite,
anonymousPosition,
CX_MAT_NUMBER
Expand All @@ -341,22 +344,22 @@ void map_WhenReportedSammToProductItemStock_ReturnsMultipleReportedProductItemSt

// Check for oprStockBlocked
List<? extends ItemStock> potentialOprStockBlocked = filterReportedItemStock(
reportedProductItemStocks,
reportedMaterialItemStocks,
oprStockBlocked,
positionWithOrderPositionReference,
CX_MAT_NUMBER
);
assertEquals(1, potentialOprStockBlocked.size());

// Test that the OPR is mapped correctly
ReportedProductItemStock reportedOprProductItemStock = (ReportedProductItemStock) potentialOprStockBlocked.get(0);
assertEquals(OPR_REF_CUSTOMER_ORDER_ID, reportedOprProductItemStock.getCustomerOrderId());
assertEquals(OPR_REF_SUPPLIER_ORDER_ID, reportedOprProductItemStock.getSupplierOrderId());
assertEquals(OPR_REF_CUSTOMER_POS_ID, reportedOprProductItemStock.getCustomerOrderPositionId());
ReportedMaterialItemStock reportedOprMaterialItemStock = (ReportedMaterialItemStock) potentialOprStockBlocked.get(0);
assertEquals(OPR_REF_CUSTOMER_ORDER_ID, reportedOprMaterialItemStock.getCustomerOrderId());
assertEquals(OPR_REF_SUPPLIER_ORDER_ID, reportedOprMaterialItemStock.getSupplierOrderId());
assertEquals(OPR_REF_CUSTOMER_POS_ID, reportedOprMaterialItemStock.getCustomerOrderPositionId());

// Check for oprStockNotBlocked
List<? extends ItemStock> potentialOprStockNotBlocked = filterReportedItemStock(
reportedProductItemStocks,
reportedMaterialItemStocks,
oprStockBlocked,
positionWithOrderPositionReference,
CX_MAT_NUMBER
Expand All @@ -365,11 +368,11 @@ void map_WhenReportedSammToProductItemStock_ReturnsMultipleReportedProductItemSt

// ATTENTION: This variable is used in marshalling tests
// This has been done to do the perspective Switch (supplier)
SAMM_FROM_CUSTOMER_PARTNER = inboundProductStockSamm;
SAMM_FROM_CUSTOMER_PARTNER = inboundMaterialStockSamm;
}

/**
* Tests following Scenario: Test checks if the SAMM can be transferred into a ReportedProductItemStock
* Tests following Scenario: Test checks if the SAMM can be transferred into a ReportedMaterialItemStock
*
* In technical terms, this means the following:
* <li>Given: Use the {@code SAMM_FROM_CUSTOMER_PARTNER} created in previous test</li>
Expand All @@ -395,13 +398,13 @@ void test_unmarshalling() {
when(materialService.findByMaterialNumberCx(CX_MAT_NUMBER)).thenReturn(material);
when(mprService.find(material, customerPartner)).thenReturn(mpr);

var list = itemStockSammMapper.itemStockSammToReportedProductItemStock(SAMM_FROM_CUSTOMER_PARTNER, supplierPartner);
var list = itemStockSammMapper.itemStockSammToReportedMaterialItemStock(SAMM_FROM_CUSTOMER_PARTNER, supplierPartner);
assertNotNull(list);
assertEquals(5, list.size());
}

/**
* Tests following Scenario: Test checks if the SAMM can be transferred into a ReportedProductItemStock via the
* Tests following Scenario: Test checks if the SAMM can be transferred into a ReportedMaterialItemStock via the
* JSON serializationS
*
* In technical terms, this means the following:
Expand Down Expand Up @@ -440,15 +443,15 @@ void test_deserializationFromJson() throws Exception {
});
var itemStockSamm = objectMapper.readValue(sammJsonString, ItemStockSamm.class);
assertEquals(SAMM_FROM_CUSTOMER_PARTNER, itemStockSamm);
var list = itemStockSammMapper.itemStockSammToReportedProductItemStock(itemStockSamm, supplierPartner);
var list = itemStockSammMapper.itemStockSammToReportedMaterialItemStock(itemStockSamm, supplierPartner);
assertEquals(5, list.size());
}

private List<? extends ItemStock> filterReportedItemStock(List<? extends ItemStock> reportedProductItemStocks, AllocatedStock allocatedStock, Position position, String cxMaterialNumber) {
private List<? extends ItemStock> filterReportedItemStock(List<? extends ItemStock> reportedMaterialItemStocks, AllocatedStock allocatedStock, Position position, String cxMaterialNumber) {

if (position.getOrderPositionReference() == null) {

List<? extends ItemStock> potentialStocks = reportedProductItemStocks.stream()
List<? extends ItemStock> potentialStocks = reportedMaterialItemStocks.stream()
.filter(item -> item.isBlocked() == allocatedStock.getIsBlocked())
.filter(item -> item.getMeasurementUnit().equals(allocatedStock.getQuantityOnAllocatedStock().getUnit()))
.filter(item -> item.getQuantity() == allocatedStock.getQuantityOnAllocatedStock().getValue())
Expand All @@ -462,7 +465,7 @@ private List<? extends ItemStock> filterReportedItemStock(List<? extends ItemSto
.collect(Collectors.toList());
return potentialStocks;
} else {
List<? extends ItemStock> potentialStocks = reportedProductItemStocks.stream()
List<? extends ItemStock> potentialStocks = reportedMaterialItemStocks.stream()
.filter(item -> item.isBlocked() == allocatedStock.getIsBlocked())
.filter(item -> item.getMeasurementUnit().equals(allocatedStock.getQuantityOnAllocatedStock().getUnit()))
.filter(item -> item.getQuantity() == allocatedStock.getQuantityOnAllocatedStock().getValue())
Expand Down
Loading