Claude review feedback. Enable ONPRC_EHR tests on PostgreSQL.

Author: labkey-adam

onprc_ehr/resources/schemas/dbscripts/postgresql/onprc_ehr-0.000-25.000.sql

@@ -269,7 +269,7 @@ CREATE TABLE onprc_ehr.Frequency_DayofWeek(
 
 CREATE TABLE onprc_ehr.usersActiveNames(
     Email varchar(64) NULL,
-    _ts TIMESTAMP NOT NULL,
+    _ts TIMESTAMP DEFAULT now(),
     EntityId ENTITYID NULL,
     CreatedBy USERID NULL,
     Created TIMESTAMP NULL,
@@ -397,7 +397,7 @@ CREATE TABLE onprc_ehr.PotentialSire_source(
     Species varchar(100) NULL,
     room varchar(100) NULL,
     cage varchar(100) NULL,
-    SireAgeAtTime integer NULL,
+    SireAgeAtTime integer NULL, -- TODO: Check this - DateTime type on SQL Server, but looks like INTEGER is the correct type
     PotentialSire varchar(100) NULL,
     SireBirth TIMESTAMP NULL,
     Siregender varchar(100) NULL,
@@ -419,7 +419,7 @@ CREATE TABLE onprc_ehr.PotentialDam_source(
     Species varchar(100) NULL,
     room varchar(100) NULL,
     cage varchar(100) NULL,
-    DamAgeAtTime integer NULL,
+    DamAgeAtTime integer NULL, -- TODO: Check this - DateTime type on SQL Server, but looks like INTEGER is the correct type
     PotentialDam varchar(100) NULL,
     DamBirth TIMESTAMP NULL,
     Damgender varchar(100) NULL,
@@ -441,9 +441,9 @@ CREATE TABLE onprc_ehr.PotentialParents_source(
     Species varchar(100) NULL,
     BirthRoom varchar(100) NULL,
     Birthcage varchar(100) NULL,
-    ParentAgeAtTime integer NULL,
+    ParentAgeAtTime integer NULL, -- TODO: Check this - DateTime type on SQL Server, but looks like INTEGER is the correct type
     PotentialParent varchar(100) NULL,
-    "[PotentialParentType" varchar(100) NULL,  -- TODO: Yes, we need to get rid of that bracket, but this is how it is in the SQL Server script
+    "[PotentialParentType" varchar(100) NULL, -- TODO: Yes, we need to get rid of that bracket, but this is how it is in the SQL Server script
     ParentBirth TIMESTAMP NULL,
     Parentgender varchar(100) NULL,
     ParentSpecies varchar(100) NULL,
@@ -702,7 +702,7 @@ CREATE TABLE onprc_ehr.Prima_TissueCollections(
     PreviousVersionId int NULL,
     Title varchar(127) NOT NULL,
     Created TIMESTAMPTZ NOT NULL,
-    LastModified TIMESTAMP NOT NULL,
+    LastModified TIMESTAMP DEFAULT now(),
     Abbreviation varchar(127) NULL
 );
 
@@ -949,15 +949,15 @@ BEGIN
         Name,
         UserId,
         'Active_Groups',
-        Active,
+        CASE WHEN Active THEN 1 ELSE 0 END,
         Type,
         NULL,
         now(),
         NULL
     FROM core.Principals
     WHERE type = 'g'
       AND UserId > 0
-      AND Active = 1
+      AND Active IS TRUE
       AND Container IS NULL;
 
     RETURN 0;

onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/AbstractGenericONPRC_EHRTest.java

@@ -39,7 +39,6 @@
 import org.labkey.test.util.LogMethod;
 import org.labkey.test.util.PasswordUtil;
 import org.labkey.test.util.SchemaHelper;
-import org.labkey.test.util.SqlserverOnlyTest;
 import org.labkey.test.util.ehr.EHRClientAPIHelper;
 import org.labkey.test.util.ext4cmp.Ext4CmpRef;
 import org.labkey.test.util.ext4cmp.Ext4ComboRef;
@@ -60,7 +59,7 @@
 
 import static org.junit.Assert.assertTrue;
 
-public abstract class AbstractGenericONPRC_EHRTest extends AbstractGenericEHRTest implements SqlserverOnlyTest
+public abstract class AbstractGenericONPRC_EHRTest extends AbstractGenericEHRTest
 {
     protected static final String REFERENCE_STUDY_PATH = "/resources/referenceStudy";
     protected static final String GENETICS_PIPELINE_LOG_PATH = REFERENCE_STUDY_PATH + "/kinship/EHR Kinship Calculation/kinship.txt.log";

onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_BillingTest.java

@@ -36,6 +36,7 @@
 import org.labkey.test.util.Ext4Helper;
 import org.labkey.test.util.LogMethod;
 import org.labkey.test.util.PortalHelper;
+import org.labkey.test.util.SqlserverOnlyTest;
 import org.labkey.test.util.ext4cmp.Ext4FieldRef;
 import org.labkey.test.util.ext4cmp.Ext4GridRef;
 
@@ -55,7 +56,7 @@
 
 @Category({EHR.class, ONPRC.class})
 @BaseWebDriverTest.ClassTimeout(minutes = 20)
-public class ONPRC_BillingTest extends AbstractONPRC_EHRTest
+public class ONPRC_BillingTest extends AbstractONPRC_EHRTest implements SqlserverOnlyTest
 {
     protected static String PROJECT_NAME = "ONPRC_Billing_TestProject";
     private static final String BILLING_FOLDER_PATH = "/" + PROJECT_NAME + "/" + BILLING_FOLDER;

onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_RestrictedIssueTest.java

@@ -15,7 +15,6 @@
 import org.labkey.test.pages.search.SearchResultsPage;
 import org.labkey.test.util.IssuesHelper;
 import org.labkey.test.util.SearchHelper;
-import org.labkey.test.util.SqlserverOnlyTest;
 import org.labkey.test.util.TestUser;
 
 import java.util.Arrays;
@@ -26,7 +25,7 @@
 import static org.labkey.test.util.PermissionsHelper.FOLDER_ADMIN_ROLE;
 
 @Category({EHR.class, ONPRC.class})
-public class ONPRC_RestrictedIssueTest extends BaseWebDriverTest implements SqlserverOnlyTest
+public class ONPRC_RestrictedIssueTest extends BaseWebDriverTest
 {
     private final IssuesHelper _issuesHelper;