621: Implement check for linked orders/results #988

basiliskus · 2024-03-29T16:54:42Z

Implement check for linked orders/results

Created MessageLink as an abstraction of message links
Check for messages to link given a received submission id. Use partner metadata (placerOrderNumber, sendingApplicationId and sendingFacilityId) to match to other submissions
- If there's no match, don't create a link
- If there's a match and there's an existing message link, add submission id to link
- If there's a match and there's no existing message link, create a new link with the matched submission ids

Issue

#621

Checklist

I have added tests to cover my changes
I have added logging where useful (with appropriate log level)
I have added JavaDocs where required
I have updated the documentation accordingly

.../java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataOrchestrator.java

etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/PostgresDao.java

…exists

…ssageLinking and refactored to resuse code

…, added initial implementation for FileMessageLinkStorage class

…d dependencies

…case

…elper

… methods in PartnerMetadataOrchestrator and SendOrderUseCase

…uuid

etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/PostgresDao.java

halprin

More comments.

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/messagelink/MessageLink.java

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/orders/SendOrderUseCase.java

etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/PostgresDao.java

jorg3lopez · 2024-04-15T16:05:15Z

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/messagelink/MessageLink.java

+ * This class represents a link between messages. Each link has a unique ID and is associated with a
+ * set of message IDs to link.
+ */
+public final class MessageLink {


Thoughts on making this a record?

Not sure if it makes sense here as we need to manage state for message ids. It's not supposed to be immutable

Yes. What remains immutable is the reference to the Set object, but you can modify the contents of the Set itself.

…r sending to RS

…e.getMessageLink

halprin

This looks really good!

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/messagelink/MessageLinkException.java

etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/messagelink/MessageLinkTest.groovy

sonarqubecloud · 2024-04-15T23:55:04Z

Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
96.9% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

halprin

Sweet! Great changes to the PostgresDao and thanks for moving the logic for reading the links out of the PostgresDao. That will make it easier to migrate once my PR is merged.

Refactored to invert if

4dfe42a

basiliskus changed the base branch from main to story-621-save_new_metadata March 29, 2024 16:55

added skeleton for methods to implement

5096feb

basiliskus changed the title ~~Implement check for linked orders/results~~ 621: Implement check for linked orders/results Mar 29, 2024

jcrichlake reviewed Mar 29, 2024

View reviewed changes

.../java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataOrchestrator.java Outdated Show resolved Hide resolved

basiliskus added 2 commits March 29, 2024 13:10

Added methods to retrieve linked metadata

aab57cf

Added methods to get linked messages records

8bda229

jcrichlake reviewed Apr 1, 2024

View reviewed changes

etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/PostgresDao.java Outdated Show resolved Hide resolved

basiliskus and others added 22 commits April 1, 2024 10:34

Reverted if-statement inversion

c0c99bf

WIP: implementation to save message links

be11531

Refactored query to use self-join instead of nested query

e4d5b7b

Added MessageLink and fixed db retrieval

129b448

Refactored to fix retrieval logic

e00fa8f

Merge branch 'story-621-save_new_metadata' into story/621/check-link-…

97ac36a

…exists

Merge branch 'story-621-save_new_metadata' into story/621/check-link-…

3f43dc6

…exists

Merge branch 'story-621-save_new_metadata' into story/621/check-link-…

ccb97b8

…exists

Added implementation for FilePartnerMetadataStorage.readMetadataForMe…

e698f41

…ssageLinking and refactored to resuse code

Added interface and custom exception, renamed classes for consistency…

07da76a

…, added initial implementation for FileMessageLinkStorage class

Added implementation for FileMessageLinkStorage methods and registere…

a975a91

…d dependencies

Refactored MessageLink to abstract from db structure and reflect use …

32d3efe

…case

Added test coverage for FileMessageLinkStorage

d141281

Added calls to findMessagesIdsToLink and linkMessages in SendMessageH…

ba0b8b3

…elper

Fixed implementation for linkMessages and added test coverage for new…

534ac83

… methods in PartnerMetadataOrchestrator and SendOrderUseCase

Adde tests for MessageLink and MessageLinkException

b34eb10

Fixed failing test

9068b2a

Added test coverage for FileMessageLinkStorage

2c87674

Added DatabaseMessageLinkStorage tests

12016a4

Fixed and added tests for readMetadataForMessageLinking

8135b71

Added tests for DatabasePartnerMetadataStorage

9b12c6b

added test coverage for linkMessages

08fcbb3

basiliskus and others added 4 commits April 12, 2024 08:08

Merge branch 'main' into story/621/check-link-exists

c9e5b5e

Merge branch 'main' into story/621/check-link-exists

09f2bcf

Added migration scripts

a1f0809

Made changes to reflect update made to link_id data type from int to …

113d026

…uuid

basiliskus marked this pull request as ready for review April 12, 2024 21:41

basiliskus requested review from jcrichlake, halprin and jorg3lopez April 12, 2024 21:41

Merge branch 'main' into story/621/check-link-exists

1d1b9ce

halprin reviewed Apr 15, 2024

View reviewed changes

etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/PostgresDao.java Outdated Show resolved Hide resolved

halprin reviewed Apr 15, 2024

View reviewed changes

jorg3lopez reviewed Apr 15, 2024

View reviewed changes

basiliskus added 7 commits April 15, 2024 10:21

Simplified set handling

29ce246

Fixed tests

776bfc1

Refactored to remove insertMessageLink and resuse upsertData

a21a5a5

Added linkMessage to Send Result UseCase and moved to link right afte…

8972370

…r sending to RS

Refactored to avoid dealing with null linkId

59ae84a

Moved PostgresDao.fetchMessageLink logic to DatabaseMessageLinkStorag…

ac39308

…e.getMessageLink

Added test coverage

43481a3

halprin reviewed Apr 15, 2024

View reviewed changes

basiliskus added 5 commits April 15, 2024 15:09

Fixed foreign key creation

2752ac6

Refactored upsertData to be more generic in handling ON CONFLICT

7b1080b

Made improvements based on PR feedback

9ed1fc5

Removed test that should be included in validateGettersAndSetters

0d5b389

Added test coverage

9c63ce8

basiliskus requested a review from halprin April 16, 2024 00:00

halprin approved these changes Apr 16, 2024

View reviewed changes

basiliskus merged commit 3512028 into main Apr 16, 2024
15 checks passed

basiliskus deleted the story/621/check-link-exists branch April 16, 2024 14:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

621: Implement check for linked orders/results #988

621: Implement check for linked orders/results #988

basiliskus commented Mar 29, 2024 •

edited

Loading

halprin left a comment

jorg3lopez Apr 15, 2024

basiliskus Apr 15, 2024

jorg3lopez Apr 15, 2024

halprin left a comment

sonarqubecloud bot commented Apr 15, 2024

halprin left a comment

621: Implement check for linked orders/results #988

621: Implement check for linked orders/results #988

Conversation

basiliskus commented Mar 29, 2024 • edited Loading

Implement check for linked orders/results

Issue

Checklist

halprin left a comment

Choose a reason for hiding this comment

jorg3lopez Apr 15, 2024

Choose a reason for hiding this comment

basiliskus Apr 15, 2024

Choose a reason for hiding this comment

jorg3lopez Apr 15, 2024

Choose a reason for hiding this comment

halprin left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Apr 15, 2024

Quality Gate passed

halprin left a comment

Choose a reason for hiding this comment

basiliskus commented Mar 29, 2024 •

edited

Loading