CIRC-1556 Close declared lost loan (Lost and paid status) for actual cost #1159

Mykyta-Varenyk · 2022-06-30T13:14:23Z

Resolves: https://issues.folio.org/browse/CIRC-1556

… been paid or enough time for charging has passed

…into CIRC-1556 � Conflicts: � src/main/java/org/folio/circulation/domain/ActualCostRecord.java � src/main/java/org/folio/circulation/infrastructure/storage/ActualCostRecordRepository.java � src/main/java/org/folio/circulation/resources/RequestFromRepresentationService.java � src/main/java/org/folio/circulation/storage/mappers/ActualCostRecordMapper.java � src/test/java/api/support/fixtures/FeeFineAccountFixture.java

descriptors/ModuleDescriptor-template.json

src/main/java/org/folio/circulation/domain/policy/lostitem/LostItemPolicy.java

src/main/java/org/folio/circulation/infrastructure/storage/ActualCostRecordRepository.java

descriptors/ModuleDescriptor-template.json

src/main/java/org/folio/circulation/CirculationVerticle.java

src/main/java/org/folio/circulation/infrastructure/storage/ActualCostRecordRepository.java

src/main/java/org/folio/circulation/infrastructure/storage/inventory/ItemRepository.java

src/main/java/org/folio/circulation/resources/ExpiredActualCostProcessingResource.java

… CIRC-1556 � Conflicts: � src/main/java/org/folio/circulation/infrastructure/storage/inventory/ItemRepository.java

alexanderkurash · 2022-07-07T15:07:23Z

...n/java/org/folio/circulation/resources/handlers/LoanRelatedFeeFineClosedHandlerResource.java

-    final var loanRepository = new LoanRepository(clients, itemRepository, userRepository);
-    final var accountRepository = new AccountRepository(clients);
-    final var lostItemPolicyRepository = new LostItemPolicyRepository(clients);
+  private CompletableFuture<Result<Void>> processEvent(LoanRepository loanRepository,


Move loanRepository.getById to the service, remove this method

alexanderkurash · 2022-07-07T15:08:19Z

src/main/java/org/folio/circulation/services/CloseLoanWithLostItemService.java

+
+  public CloseLoanWithLostItemService(LoanRepository loanRepository, ItemRepository itemRepository,
+    AccountRepository accountRepository, LostItemPolicyRepository lostItemPolicyRepository,
+    EventPublisher eventPublisher, ActualCostRecordRepository actualCostRecordRepository) {


alexanderkurash · 2022-07-07T15:08:26Z

src/main/java/org/folio/circulation/services/CloseLoanWithLostItemService.java

+import static org.folio.circulation.support.utils.ClockUtil.getZoneId;
+import static org.folio.circulation.support.utils.ClockUtil.getZonedDateTime;
+public class CloseLoanWithLostItemService {
+  private final LoanRepository loanRepository;


alexanderkurash · 2022-07-07T15:08:34Z

...n/java/org/folio/circulation/resources/handlers/LoanRelatedFeeFineClosedHandlerResource.java

@@ -54,13 +51,19 @@ public void register(Router router) {

  private void handleFeeFineClosedEvent(RoutingContext routingContext) {
    final WebContext context = new WebContext(routingContext);
-    final EventPublisher eventPublisher = new EventPublisher(routingContext);
+    final var eventPublisher = new EventPublisher(routingContext);
+    final Clients clients = create(context, client);


alexanderkurash · 2022-07-07T15:22:04Z

.../java/org/folio/circulation/services/actualcostrecord/ActualCostRecordExpirationService.java

+      .flatMapFuture(accountRepository::findAccountsForLoans)
+      .flatMapFuture(lostItemPolicyRepository::findLostItemPoliciesForLoans)
+      .flatMapFuture(actualCostRecordRepository::fetchActualCostRecords)
+      .flatMapFuture(loans -> allOf(loans.getRecords(),
+        closeLoanWithLostItemService::tryCloseLoanForActualCostExpiration))


check this - do we take the Result status into account

alexanderkurash · 2022-07-07T15:35:57Z

src/main/java/org/folio/circulation/services/CloseLoanWithLostItemService.java

+      return completedFuture(succeeded(loan));
+    }
+
+    boolean wasLoanOpen = loan.isOpen();


can this be checked earlier?

alexanderkurash · 2022-07-07T15:50:00Z

src/main/java/org/folio/circulation/services/CloseLoanWithLostItemService.java

+
+        String expirationDate = actualCostRecord.getExpirationDate();
+
+        return expirationDate != null && getZonedDateTime().isAfter(DateFormatUtil.parseDateTime(


should be parsed in ActualCostRecord

sonarqubecloud · 2022-07-14T14:44:02Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

89.9% Coverage
0.0% Duplication

roman-barannyk · 2022-07-14T14:55:14Z

src/main/java/org/folio/circulation/infrastructure/storage/ActualCostRecordRepository.java

+  private CompletableFuture<Result<Map<String, ActualCostRecord>>> buildLoanIdToActualCostRecordMap(
+    Collection<Loan> loans) {
+
+    final Set<String> loanIds = loans.stream()
+      .filter(Objects::nonNull)
+      .map(Loan::getId)
+      .filter(Objects::nonNull)
+      .collect(Collectors.toSet());
+
+    return findWithMultipleCqlIndexValues(actualCostRecordStorageClient,
+      ACTUAL_COST_RECORDS, ActualCostRecordMapper::toDomain)
+      .find(byIndex(LOAN_ID_FIELD_NAME, loanIds))
+      .thenApply(mapResult(r -> r.toMap(ActualCostRecord::getLoanId)));


move to one method

roman-barannyk · 2022-07-14T15:02:59Z

src/main/java/org/folio/circulation/infrastructure/storage/ActualCostRecordRepository.java

+    return loanResult.after(loan -> createActualCostRecordCqlFinder().findByQuery(
+        exactMatch(LOAN_ID_FIELD_NAME, loan.getId()), one())
+      .thenApply(records -> records.map(MultipleRecords::firstOrNull))
+      .thenApply(mapResult(ActualCostRecordMapper::toDomain))
+      .thenApply(mapResult(loan::withActualCostRecord)));


call fetchActualCostRecords with one loan

Mykyta-Varenyk added 7 commits June 29, 2022 14:06

CIRC-1556 When actual cost is selected, close the loan only if it has…

46ed0c6

… been paid or enough time for charging has passed

CIRC-1556 Create actual cost expiration timer

11a57a2

Fix conflicts

03d72da

CIRC-1556 Fix comments

4097f26

CIRC-1556 Refactor

f3ff403

CIRC-1556 Add module permissions

3e2b0dc

roman-barannyk reviewed Jul 6, 2022

View reviewed changes

roman-barannyk added 2 commits July 6, 2022 16:11

CIRC-1556 refactoring

7353375

CIRC-1556 fix code smells

b600334

alexanderkurash changed the title ~~Circ 1556~~ CIRC-1556 Close declared lost and aged to lost loan (Lost and paid status) for actual cost Jul 6, 2022

CIRC-1556 Extend ItemRelatedRecord

574d5de

alexanderkurash reviewed Jul 7, 2022

View reviewed changes

roman-barannyk added 5 commits July 7, 2022 12:30

CIRC-1556 refactoring according to code review

55acdb5

Merge branch 'CIRC-1556' of github.com:folio-org/mod-circulation into…

508e5bf

… CIRC-1556 � Conflicts: � src/main/java/org/folio/circulation/infrastructure/storage/inventory/ItemRepository.java

CIRC-1556 refactoring according to code review

69f0cad

CIRC-1556 fix code smell

382f457

CIRC-1556 fix code smell

8274392

alexanderkurash reviewed Jul 7, 2022

View reviewed changes

alexanderkurash and others added 6 commits July 7, 2022 18:52

CIRC-1557 Refactor close loan service

b202b6e

CIRC-1557 refactoring after code review

6205170

CIRC-1557 remove code smells

ad237f3

CIRC-1557 remove unused imports

01e300c

CIRC-1557 refactoring after code review

2b0ddf6

CIRC-1557 remove unused import

0f3057c

roman-barannyk changed the title ~~CIRC-1556 Close declared lost and aged to lost loan (Lost and paid status) for actual cost~~ CIRC-1556 Close declared lost loan (Lost and paid status) for actual cost Jul 14, 2022

roman-barannyk reviewed Jul 14, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CIRC-1556 Close declared lost loan (Lost and paid status) for actual cost #1159

CIRC-1556 Close declared lost loan (Lost and paid status) for actual cost #1159

Mykyta-Varenyk commented Jun 30, 2022 •

edited

Loading

alexanderkurash Jul 7, 2022

alexanderkurash Jul 7, 2022

alexanderkurash Jul 7, 2022

alexanderkurash Jul 7, 2022

alexanderkurash Jul 7, 2022

alexanderkurash Jul 7, 2022

alexanderkurash Jul 7, 2022

sonarqubecloud bot commented Jul 14, 2022

roman-barannyk Jul 14, 2022

roman-barannyk Jul 14, 2022


		String expirationDate = actualCostRecord.getExpirationDate();

		return expirationDate != null && getZonedDateTime().isAfter(DateFormatUtil.parseDateTime(

CIRC-1556 Close declared lost loan (Lost and paid status) for actual cost #1159

Are you sure you want to change the base?

CIRC-1556 Close declared lost loan (Lost and paid status) for actual cost #1159

Conversation

Mykyta-Varenyk commented Jun 30, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Jul 14, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mykyta-Varenyk commented Jun 30, 2022 •

edited

Loading