Skip to content

Bump #92

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

Merged
echerniak merged 1 commit into from
Sep 8, 2025
Merged

Bump #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.vality</groupId>
<artifactId>service-parent-pom</artifactId>
<version>3.1.6</version>
<version>3.1.7</version>
</parent>

<artifactId>anapi-v2</artifactId>
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/dev/vality/anapi/v2/service/DominantService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import dev.vality.damsel.domain.*;
import dev.vality.damsel.domain_config_v2.RepositoryClientSrv;
import dev.vality.damsel.domain_config_v2.VersionReference;
import dev.vality.damsel.domain_config_v2.VersionedObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.thrift.TException;
Expand All @@ -21,8 +22,7 @@ public class DominantService {
public List<String> getShopIds(String partyId, String realm) {
try {
log.info("Looking for shops, partyId={}, realm={}", partyId, realm);
List<ShopConfigRef> shopsRefs = getShopConfigRefs(partyId);
List<ShopConfigObject> shopsObjects = getShopConfigObjects(shopsRefs);
List<ShopConfigObject> shopsObjects = getShopConfigObjects(partyId);
var shopIds = shopsObjects.stream()
.filter(shopConfigObject -> realmMatches(realm, shopConfigObject))
.map(shopConfigObject -> shopConfigObject.getRef().getId()).toList();
Expand All @@ -33,16 +33,16 @@ public List<String> getShopIds(String partyId, String realm) {
}
}

private List<ShopConfigRef> getShopConfigRefs(String partyId) throws TException {
private List<ShopConfigObject> getShopConfigObjects(String partyId) throws TException {
var partyReference = Reference.party_config(new PartyConfigRef(partyId));
var party = dominantClient.checkoutObject(new VersionReference(), partyReference);
return party.getObject().getPartyConfig().getData().getShops();
}

private List<ShopConfigObject> getShopConfigObjects(List<ShopConfigRef> shopConfigRefs) throws TException {
var shopConfigs = dominantClient.checkoutObjects(new VersionReference(),
shopConfigRefs.stream().map(Reference::shop_config).toList());
return shopConfigs.stream().map(domainObject -> domainObject.getObject().getShopConfig()).toList();
var versionedObjectWithReferences =
dominantClient.checkoutObjectWithReferences(new VersionReference(), partyReference);
var shopConfigObjects = versionedObjectWithReferences.getReferencedBy().stream()
.map(VersionedObject::getObject)
.map(DomainObject::getShopConfig)
.toList();
log.debug("Receive shops for partyId: {}, shopConfigObjects ='{}'", partyId, shopConfigObjects);
return shopConfigObjects;
}

private boolean realmMatches(String expectedRealm, ShopConfigObject shopConfigObject) {
Expand Down
Loading