From 60085a404490f21ba9cd7b479fe51521251b32c9 Mon Sep 17 00:00:00 2001 From: David Robinson <14000840+khelwood@users.noreply.github.com> Date: Tue, 10 Mar 2026 15:11:35 +0000 Subject: [PATCH 1/2] x1510 load visium concentration timestamp in cyt overview table --- .../uk/ac/sanger/sccp/stan/model/CytassistOverview.java | 9 +++++++++ .../CytassistOverviewDataCompilerImp.java | 1 + src/main/resources/db/changelog/changelog-3.14.xml | 3 +++ .../sccp/stan/integrationtest/TestCytassistOverview.java | 2 ++ .../TestCytassistOverviewDataCompiler.java | 1 + 5 files changed, 16 insertions(+) diff --git a/src/main/java/uk/ac/sanger/sccp/stan/model/CytassistOverview.java b/src/main/java/uk/ac/sanger/sccp/stan/model/CytassistOverview.java index 8c07af26..e6691bcb 100644 --- a/src/main/java/uk/ac/sanger/sccp/stan/model/CytassistOverview.java +++ b/src/main/java/uk/ac/sanger/sccp/stan/model/CytassistOverview.java @@ -42,6 +42,7 @@ public class CytassistOverview { private String visiumConcentrationValue; private String visiumConcentrationAverageSize; private String visiumConcentrationRange; + private LocalDateTime visiumConcentrationPerformed; private String latestBarcode; private String latestLwState; private String latestBioState; @@ -289,6 +290,14 @@ public void setVisiumConcentrationRange(String visiumConcentrationRange) { this.visiumConcentrationRange = visiumConcentrationRange; } + public LocalDateTime getVisiumConcentrationPerformed() { + return this.visiumConcentrationPerformed; + } + + public void setVisiumConcentrationPerformed(LocalDateTime visiumConcentrationPerformed) { + this.visiumConcentrationPerformed = visiumConcentrationPerformed; + } + public String getLatestBarcode() { return this.latestBarcode; } diff --git a/src/main/java/uk/ac/sanger/sccp/stan/service/cytassistoverview/CytassistOverviewDataCompilerImp.java b/src/main/java/uk/ac/sanger/sccp/stan/service/cytassistoverview/CytassistOverviewDataCompilerImp.java index 86348eb4..d5fd4aaf 100644 --- a/src/main/java/uk/ac/sanger/sccp/stan/service/cytassistoverview/CytassistOverviewDataCompilerImp.java +++ b/src/main/java/uk/ac/sanger/sccp/stan/service/cytassistoverview/CytassistOverviewDataCompilerImp.java @@ -420,6 +420,7 @@ && commentApplies(oc, foundSsIds)) { } } } + d.row.setVisiumConcentrationPerformed(found.getPerformed()); } } } diff --git a/src/main/resources/db/changelog/changelog-3.14.xml b/src/main/resources/db/changelog/changelog-3.14.xml index fca3bd0e..15e41100 100644 --- a/src/main/resources/db/changelog/changelog-3.14.xml +++ b/src/main/resources/db/changelog/changelog-3.14.xml @@ -106,6 +106,9 @@ + + + diff --git a/src/test/java/uk/ac/sanger/sccp/stan/integrationtest/TestCytassistOverview.java b/src/test/java/uk/ac/sanger/sccp/stan/integrationtest/TestCytassistOverview.java index d6e553ab..c5aabb10 100644 --- a/src/test/java/uk/ac/sanger/sccp/stan/integrationtest/TestCytassistOverview.java +++ b/src/test/java/uk/ac/sanger/sccp/stan/integrationtest/TestCytassistOverview.java @@ -216,6 +216,7 @@ public void testUpdate() { assertEquals("70", co.getVisiumConcentrationValue()); assertNull(co.getVisiumConcentrationAverageSize()); assertNull(co.getVisiumConcentrationRange()); + assertEquals(vc1.getPerformed(), co.getVisiumConcentrationPerformed()); assertEquals(lws[5].getBarcode(), co.getLatestBarcode()); assertEquals(Labware.State.active.toString(), co.getLatestLwState()); assertEquals("Tissue", co.getLatestBioState()); @@ -253,6 +254,7 @@ public void testUpdate() { assertEquals("80", co.getVisiumConcentrationValue()); assertEquals("75", co.getVisiumConcentrationAverageSize()); assertEquals("1-2", co.getVisiumConcentrationRange()); + assertEquals(vc2.getPerformed(), co.getVisiumConcentrationPerformed()); assertEquals(lws[6].getBarcode(), co.getLatestBarcode()); assertEquals(Labware.State.released.toString(), co.getLatestLwState()); assertEquals(time(28), co.getLatestBarcodeReleased()); diff --git a/src/test/java/uk/ac/sanger/sccp/stan/service/cytassistoverview/TestCytassistOverviewDataCompiler.java b/src/test/java/uk/ac/sanger/sccp/stan/service/cytassistoverview/TestCytassistOverviewDataCompiler.java index 6e4f9346..2fb5ee63 100644 --- a/src/test/java/uk/ac/sanger/sccp/stan/service/cytassistoverview/TestCytassistOverviewDataCompiler.java +++ b/src/test/java/uk/ac/sanger/sccp/stan/service/cytassistoverview/TestCytassistOverviewDataCompiler.java @@ -661,6 +661,7 @@ void testLoadVisiumConcentration() { assertEquals("50", d.row.getVisiumConcentrationValue()); assertEquals("15", d.row.getVisiumConcentrationAverageSize()); assertEquals("10-20", d.row.getVisiumConcentrationRange()); + assertEquals(ops.get(0).getPerformed(), d.row.getVisiumConcentrationPerformed()); assertThat(d.users).containsExactly(user); d = data.get(1); assertEquals("Library concentration", d.row.getVisiumConcentrationType()); From d6c03c8c2ad7dde6c7aa15b3853f4176c35eb7b2 Mon Sep 17 00:00:00 2001 From: David Robinson <14000840+khelwood@users.noreply.github.com> Date: Tue, 10 Mar 2026 15:16:21 +0000 Subject: [PATCH 2/2] x1510 add visiumConcentrationPerformed to CytassistOverview.toString() --- .../java/uk/ac/sanger/sccp/stan/model/CytassistOverview.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/uk/ac/sanger/sccp/stan/model/CytassistOverview.java b/src/main/java/uk/ac/sanger/sccp/stan/model/CytassistOverview.java index e6691bcb..4d07c33c 100644 --- a/src/main/java/uk/ac/sanger/sccp/stan/model/CytassistOverview.java +++ b/src/main/java/uk/ac/sanger/sccp/stan/model/CytassistOverview.java @@ -379,6 +379,7 @@ public String toString() { .add("visiumConcentrationValue", visiumConcentrationValue) .add("visiumConcentrationAverageSize", visiumConcentrationAverageSize) .add("visiumConcentrationRange", visiumConcentrationRange) + .add("visiumConcentrationPerformed", visiumConcentrationPerformed) .add("latestBarcode", latestBarcode) .add("latestLwState", latestLwState) .add("latestBioState", latestBioState)