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.

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

2.7 release #16

Merged
merged 28 commits into from
Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
36286df
Add developer onboarding guide
stefpiatek Nov 17, 2023
50b77dd
Increment emap versions
stefpiatek Nov 17, 2023
eaa4d18
Merge branch 'main' into stef/2.7-release
stefpiatek Nov 17, 2023
938c6e1
Remove unnecessary check for PR in comment action
stefpiatek Nov 17, 2023
9ae8443
Add health endpoint to hl7 reader
stefpiatek Feb 9, 2024
d6ad25e
Merge remote-tracking branch 'origin/main' into stef/2.7-release
stefpiatek Feb 9, 2024
9172484
Document changing the actuator port in release SOP
stefpiatek Feb 9, 2024
f47a3cc
Render mermaid inline in markdown
stefpiatek Feb 9, 2024
36687c2
Add batch processor to hoover diagram
stefpiatek Feb 9, 2024
cf47db0
Add batch processor to hoover diagram
stefpiatek Feb 9, 2024
dc26028
Tidy up formatting
stefpiatek Feb 9, 2024
c138cad
Try removing direction in mermaid
stefpiatek Feb 9, 2024
aa9a616
Use rendered mermaid
stefpiatek Feb 9, 2024
6f3010f
Move onboarding file to dev
stefpiatek Feb 9, 2024
3b65160
Fix mermaid styling?
stefpiatek Feb 9, 2024
35aa945
Add 2.7 release changelog
stefpiatek Feb 14, 2024
710769b
Link to release docs README.md
stefpiatek Feb 14, 2024
3e42d97
Link to release docs README.md
stefpiatek Feb 14, 2024
d145e68
Debug CORS
stefpiatek Feb 22, 2024
c98a946
Debug CORS
stefpiatek Feb 22, 2024
04a753f
Update spring boot starter
stefpiatek Feb 22, 2024
cad447f
Add hospital visit index
stefpiatek Apr 12, 2024
5773817
Try setting port in global config
stefpiatek Apr 12, 2024
8df2547
Get global config file from filename
stefpiatek Apr 12, 2024
e94b445
Don't inject ports anymore
stefpiatek Apr 12, 2024
377a737
Expose health endpoint
stefpiatek Apr 12, 2024
b26359b
CORS for specific origins
stefpiatek Apr 12, 2024
bcae33d
HL7 reader port should be in global config
stefpiatek Apr 12, 2024
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
15 changes: 12 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Emap

A monorepo for all core Emap functions

# Basic layout
# Setup

The EMAP project follows this structure, for deploying a live instance of EMAP follow the instructions
in [docs/core.md](docs/core.md).

```
EMAP [your root emap directory]
├── config [config files passed to docker containers, not in any repo]
Expand All @@ -14,8 +19,12 @@ EMAP [your root emap directory]
│ ├── [etc.]
```

# Using IntelliJ with emap
How to [configure IntelliJ](docs/intellij.md) to build emap and run tests.
## Developer onboarding

- How to [configure IntelliJ](docs/intellij.md) to build emap and run tests.
- [Onboarding](docs/onboarding.md) gives details on how data items are processed and the test strategies used.


# Monorepo migration

How were [old repos migrated into this repo?](docs/migration.md)
6 changes: 3 additions & 3 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>uk.ac.ucl.rits.inform</groupId>
<artifactId>core</artifactId>
<packaging>jar</packaging>
<version>2.6</version>
<version>2.7</version>
<name>Emap Core Processor</name>
<url>http://maven.apache.org</url>

Expand All @@ -20,8 +20,8 @@
<java.version>17</java.version>
<checkstyle.version>10.3.1</checkstyle.version>
<checkstyle.plugin.version>3.3.0</checkstyle.plugin.version>
<emap-star.version>2.6</emap-star.version>
<emap-interchange.version>2.6</emap-interchange.version>
<emap-star.version>2.7</emap-star.version>
<emap-interchange.version>2.7</emap-interchange.version>
<go-offline-maven-plugin.version>1.2.8</go-offline-maven-plugin.version>
</properties>

Expand Down
66 changes: 66 additions & 0 deletions docs/img/core-message-processing.mmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
classDiagram
direction BT
class InformDbOperations {
+ processMessage(AdtMessage) void
+ processMessage(LabOrderMsg) void
}
class LabCache {
+ saveEntityAndUpdateCache(RowState~LabBattery, LabBatteryAudit~) LabBattery
+ updateLabTestDefinitionCache(RowState~LabTestDefinition, LabTestDefinitionAudit~) LabTestDefinition
+ findExistingLabTestDefinition(String, String) LabTestDefinition
+ createLabBatteryElementIfNotExists(LabTestDefinition, LabBattery, Instant, Instant) LabBatteryElement
}
class LabController {
+ processLabOrder(Mrn, HospitalVisit?, LabOrderMsg, Instant) void
+ deleteLabOrdersForVisit(HospitalVisit, Instant, Instant) void
+ processLabMetadata(LabMetadataMsg, Instant) void
}
class LabOrderAuditRepository {
<<Interface>>
+ findAllIds(Long, Long, Instant, String) List~Long~
+ previouslyDeleted(Long, Long, InterchangeValue~Instant~, InterchangeValue~String~) boolean
+ findAllByHospitalVisitIdIn(Iterable~Long~) List~LabOrderAudit~
}
class LabOrderController {
+ processSampleAndOrderInformation(Mrn, HospitalVisit, LabBattery, LabOrderMsg, Instant, Instant) LabOrder
+ deleteLabOrder(LabOrder, Instant, Instant) void
+ findLabBatteryOrThrow(String, String) LabBattery
+ getLabOrdersForVisit(HospitalVisit) List~LabOrder~
+ processLabSampleAndDeleteLabOrder(Mrn, LabBattery, HospitalVisit, LabOrderMsg, Instant, Instant) void
+ getOrCreateLabBattery(String, String, Instant, Instant) LabBattery
}
class LabOrderRepository {
<<Interface>>
+ findByLabBatteryIdAndLabSampleId(LabBattery, LabSample) Optional~LabOrder~
+ findByLabBatteryIdAndLabSampleIdAndValidFromBefore(LabBattery, LabSample, Instant) Optional~LabOrder~
+ findByLabBatteryIdBatteryCodeAndLabSampleId(String, LabSample) Optional~LabOrder~
+ findByLabSampleIdExternalLabNumber(String) Optional~LabOrder~
+ findAllByHospitalVisitId(HospitalVisit) List~LabOrder~
}
class LabProcessor {
+ processMessage(LabMetadataMsg, Instant) void
+ processMessage(LabOrderMsg, Instant) void
}
class LabTestDefinitionAuditRepository {
<<Interface>>
}
class LabTestDefinitionRepository {
<<Interface>>
+ findByLabProviderAndTestLabCode(String, String) Optional~LabTestDefinition~
+ findByTestLabCode(String) Optional~LabTestDefinition~
}
class EmapOperationMessageProcessor {
<<Interface>>
+ processMessage(LabMetadataMsg) void
+ processMessage(AdtMessage) void
}

InformDbOperations *--> LabProcessor
LabCache *--> LabTestDefinitionAuditRepository
LabCache *--> LabTestDefinitionRepository
LabController *--> LabCache
LabController *--> LabOrderController
LabOrderController *--> LabOrderAuditRepository
LabOrderController *--> LabOrderRepository
LabProcessor *--> LabController
InformDbOperations ..> EmapOperationMessageProcessor
Loading
Loading