From 270a7c1ab9a7ac44cf34f41d4d3225bbc6b47c5a Mon Sep 17 00:00:00 2001 From: Bob Zhao Date: Wed, 18 Oct 2023 10:02:18 -0400 Subject: [PATCH] update tests and types --- .../src/main/resources/graphql/main.graphqls | 34 ++++---- .../api/converter/FhirConverterTest.java | 41 +++++++-- .../DeviceTypeDataLoaderHelperTest.java | 4 + .../api/graphql/DeviceManagementTest.java | 2 + .../api/model/TestEventExportTest.java | 4 + .../DeviceTypeServiceIntegrationTest.java | 67 +++++++++++++-- .../service/DeviceTypeServiceTest.java | 83 ++++++++++++++++--- .../test_util/TestDataBuilder.java | 3 + frontend/src/generated/graphql.tsx | 2 + 9 files changed, 198 insertions(+), 42 deletions(-) diff --git a/backend/src/main/resources/graphql/main.graphqls b/backend/src/main/resources/graphql/main.graphqls index 39c74eaba8..5f3ffb2c05 100644 --- a/backend/src/main/resources/graphql/main.graphqls +++ b/backend/src/main/resources/graphql/main.graphqls @@ -35,8 +35,8 @@ type Facility { isDeleted: Boolean } -type FacilityStats{ - usersSingleAccessCount:Int +type FacilityStats { + usersSingleAccessCount: Int patientsSingleAccessCount: Int } @@ -80,6 +80,7 @@ input SupportedDiseaseTestPerformedInput { supportedDisease: ID! testPerformedLoincCode: String! equipmentUid: String + equipmentUidType: String testkitNameId: String testOrderedLoincCode: String } @@ -98,6 +99,7 @@ type SupportedDiseaseTestPerformed { supportedDisease: SupportedDisease! testPerformedLoincCode: String! equipmentUid: String + equipmentUidType: String testkitNameId: String testOrderedLoincCode: String } @@ -243,7 +245,7 @@ type Patient preferredLanguage: String @requiredPermissions(anyOf: ["READ_PATIENT_LIST", "UPDATE_TEST"]) notes: String - @requiredPermissions(anyOf: ["READ_PATIENT_LIST", "UPDATE_TEST"]) + @requiredPermissions(anyOf: ["READ_PATIENT_LIST", "UPDATE_TEST"]) } # TestResult and TestOrder should have the same properties @@ -372,7 +374,7 @@ type UploadSubmissionPage { content: [UploadResult!]! } -type FeatureFlag{ +type FeatureFlag { name: String! value: Boolean! } @@ -479,7 +481,8 @@ type Query { users: [ApiUser] @requiredPermissions(allOf: ["MANAGE_USERS"]) usersWithStatus: [ApiUserWithStatus!] @requiredPermissions(allOf: ["MANAGE_USERS"]) - user(id: ID, email: String): User @requiredPermissions(allOf: ["MANAGE_USERS"]) + user(id: ID, email: String): User + @requiredPermissions(allOf: ["MANAGE_USERS"]) whoami: User! uploadSubmission(id: ID!): UploadResponse! @requiredPermissions(allOf: ["UPLOAD_RESULTS_SPREADSHEET"]) @@ -493,15 +496,12 @@ type Query { } type Mutation { - updateFacility( - facilityInfo: UpdateFacilityInput! - ): Facility @requiredPermissions(allOf: ["EDIT_FACILITY"]) - addFacility( - facilityInfo: AddFacilityInput! - ): Facility @requiredPermissions(allOf: ["EDIT_FACILITY"]) - addUserToCurrentOrg( - userInput: UserInput! - ): User @requiredPermissions(allOf: ["MANAGE_USERS"]) + updateFacility(facilityInfo: UpdateFacilityInput!): Facility + @requiredPermissions(allOf: ["EDIT_FACILITY"]) + addFacility(facilityInfo: AddFacilityInput!): Facility + @requiredPermissions(allOf: ["EDIT_FACILITY"]) + addUserToCurrentOrg(userInput: UserInput!): User + @requiredPermissions(allOf: ["MANAGE_USERS"]) updateUser( id: ID! name: NameInput @@ -525,7 +525,8 @@ type Mutation { reactivateUser(id: ID!): User @requiredPermissions(allOf: ["MANAGE_USERS"]) resendActivationEmail(id: ID!): User @requiredPermissions(allOf: ["MANAGE_USERS"]) - reactivateUserAndResetPassword(id: ID!): User @requiredPermissions(allOf: ["MANAGE_USERS"]) + reactivateUserAndResetPassword(id: ID!): User + @requiredPermissions(allOf: ["MANAGE_USERS"]) setCurrentUserTenantDataAccess( organizationExternalId: String justification: String @@ -602,8 +603,7 @@ type Mutation { id: ID! deleted: Boolean! orgExternalId: String - ): Patient - @requiredPermissions(allOf: ["ARCHIVE_PATIENT"]) + ): Patient @requiredPermissions(allOf: ["ARCHIVE_PATIENT"]) submitQueueItem( deviceTypeId: ID! specimenTypeId: ID! diff --git a/backend/src/test/java/gov/cdc/usds/simplereport/api/converter/FhirConverterTest.java b/backend/src/test/java/gov/cdc/usds/simplereport/api/converter/FhirConverterTest.java index 0cd23b7bc6..a364ce3110 100644 --- a/backend/src/test/java/gov/cdc/usds/simplereport/api/converter/FhirConverterTest.java +++ b/backend/src/test/java/gov/cdc/usds/simplereport/api/converter/FhirConverterTest.java @@ -852,10 +852,22 @@ void convertToObservation_Result_matchesJson() throws IOException { var device = DeviceType.builder().build(); var covidDiseaseTestPerformedCode = new DeviceTypeDisease( - null, covidDisease, "94500-6", "covidEquipmentUID", "covidTestkitNameId", "94500-0"); + null, + covidDisease, + "94500-6", + "covidEquipmentUID", + "covidEquipmentUIDType", + "covidTestkitNameId", + "94500-0"); var fluDiseaseTestPerformedCode = new DeviceTypeDisease( - null, fluDisease, "85477-8", "fluEquipmentUID", "fluTestkitNameId", "85477-0"); + null, + fluDisease, + "85477-8", + "fluEquipmentUID", + "fluEquipmentUidType", + "fluTestkitNameId", + "85477-0"); ReflectionTestUtils.setField( device, "supportedDiseaseTestPerformed", @@ -910,7 +922,13 @@ void convertToObservation_Result_correctionMatchesJson() throws IOException { var device = DeviceType.builder().build(); var covidDiseaseTestPerformedCode = new DeviceTypeDisease( - null, covidDisease, "94500-6", "covidEquipmentUID", "covidTestkitNameId", "94500-0"); + null, + covidDisease, + "94500-6", + "covidEquipmentUID", + "covidEquipmentUIDType", + "covidTestkitNameId", + "94500-0"); ReflectionTestUtils.setField(result, "internalId", UUID.fromString(id)); ReflectionTestUtils.setField( @@ -1653,14 +1671,27 @@ void createFhirBundle_TestEvent_matchesJson() throws IOException { var testPerformedCodesList = List.of( new DeviceTypeDisease( - deviceTypeId, covidDisease, "333-123", "equipmentUID1", "testkitNameId1", null), + deviceTypeId, + covidDisease, + "333-123", + "equipmentUID1", + "equipmentUIDType1", + "testkitNameId1", + null), new DeviceTypeDisease( - deviceTypeId, fluADisease, "444-123", "equipmentUID2", "testkitNameId2", "95422-2"), + deviceTypeId, + fluADisease, + "444-123", + "equipmentUID2", + "equipmentUIDType2", + "testkitNameId2", + "95422-2"), new DeviceTypeDisease( deviceTypeId, fluBDisease, "444-456", "equipmentUID3", + "equipmentUIDType3", "testkitNameId3", "95422-2")); diff --git a/backend/src/test/java/gov/cdc/usds/simplereport/api/devicetype/DeviceTypeDataLoaderHelperTest.java b/backend/src/test/java/gov/cdc/usds/simplereport/api/devicetype/DeviceTypeDataLoaderHelperTest.java index e27e113356..ded4413dcd 100644 --- a/backend/src/test/java/gov/cdc/usds/simplereport/api/devicetype/DeviceTypeDataLoaderHelperTest.java +++ b/backend/src/test/java/gov/cdc/usds/simplereport/api/devicetype/DeviceTypeDataLoaderHelperTest.java @@ -44,6 +44,7 @@ void getSupportedDiseases_happyPath() { UUID supportedDisease2Id = UUID.randomUUID(); String testPerformedLoinc = "test123PerformedLoinc"; String equipmentUid = "testEquipmentUid"; + String equipmentUidType = "testEquipmentUidType"; String testkitNameId = "testkitNameId"; String testOrderedLoinc = "test123OrderedLoinc"; @@ -67,6 +68,7 @@ void getSupportedDiseases_happyPath() { supportedDisease1, testPerformedLoinc, equipmentUid, + equipmentUidType, testkitNameId, testOrderedLoinc), new DeviceTypeDisease( @@ -74,6 +76,7 @@ void getSupportedDiseases_happyPath() { supportedDisease1, testPerformedLoinc, equipmentUid, + equipmentUidType, testkitNameId, testOrderedLoinc), new DeviceTypeDisease( @@ -81,6 +84,7 @@ void getSupportedDiseases_happyPath() { supportedDisease2, testPerformedLoinc, equipmentUid, + equipmentUidType, testkitNameId, testOrderedLoinc))); diff --git a/backend/src/test/java/gov/cdc/usds/simplereport/api/graphql/DeviceManagementTest.java b/backend/src/test/java/gov/cdc/usds/simplereport/api/graphql/DeviceManagementTest.java index 57efaf2973..8c1027d86e 100644 --- a/backend/src/test/java/gov/cdc/usds/simplereport/api/graphql/DeviceManagementTest.java +++ b/backend/src/test/java/gov/cdc/usds/simplereport/api/graphql/DeviceManagementTest.java @@ -126,6 +126,7 @@ private Map getCreateDeviceTypeInput() { .supportedDisease(supportedDiseaseIds.get(0)) .testPerformedLoincCode("loinc1") .equipmentUid("equipmentUid1") + .equipmentUidType("equipmentUid1Type") .testkitNameId("testkitNameId1") .testOrderedLoincCode("loinc3") .build())) @@ -155,6 +156,7 @@ private Map getUpdateDeviceTypeInput(UUID internalId) { .supportedDisease(supportedDiseaseIds.get(0)) .testPerformedLoincCode("loinc1") .equipmentUid("equipmentUid1") + .equipmentUidType("equipmentUidType1") .testkitNameId("testkitNameId1") .testOrderedLoincCode("loinc3") .build())) diff --git a/backend/src/test/java/gov/cdc/usds/simplereport/api/model/TestEventExportTest.java b/backend/src/test/java/gov/cdc/usds/simplereport/api/model/TestEventExportTest.java index 1b93f33758..355863ce9f 100644 --- a/backend/src/test/java/gov/cdc/usds/simplereport/api/model/TestEventExportTest.java +++ b/backend/src/test/java/gov/cdc/usds/simplereport/api/model/TestEventExportTest.java @@ -273,6 +273,7 @@ void sendPatientInfoWithCommonDeviceDiseaseInfo() { dataFactory.getCovidDisease(), "94500-6", "covidEquipmentUID", + "covidEquipmentUIDType", "covidTestkitNameId1", "94500-0"), new DeviceTypeDisease( @@ -280,6 +281,7 @@ void sendPatientInfoWithCommonDeviceDiseaseInfo() { dataFactory.getCovidDisease(), "94500-6", "covidEquipmentUID", + "covidEquipmentUIDType", "covidTestkitNameId2", "94500-0"))); dataFactory.addDiseasesToDevice( @@ -290,6 +292,7 @@ void sendPatientInfoWithCommonDeviceDiseaseInfo() { dataFactory.getCovidDisease(), "94500-6", "covidEquipmentUID1", + "covidEquipmentUIDType", "covidTestkitNameId", "94500-0"), new DeviceTypeDisease( @@ -297,6 +300,7 @@ void sendPatientInfoWithCommonDeviceDiseaseInfo() { dataFactory.getCovidDisease(), "94500-6", "covidEquipmentUID2", + "covidEquipmentUIDType", "covidTestkitNameId", "94500-0"))); diff --git a/backend/src/test/java/gov/cdc/usds/simplereport/service/DeviceTypeServiceIntegrationTest.java b/backend/src/test/java/gov/cdc/usds/simplereport/service/DeviceTypeServiceIntegrationTest.java index 55e42c02e0..ad285eb9d5 100644 --- a/backend/src/test/java/gov/cdc/usds/simplereport/service/DeviceTypeServiceIntegrationTest.java +++ b/backend/src/test/java/gov/cdc/usds/simplereport/service/DeviceTypeServiceIntegrationTest.java @@ -14,14 +14,17 @@ import gov.cdc.usds.simplereport.api.model.SupportedDiseaseTestPerformedInput; import gov.cdc.usds.simplereport.api.model.errors.DryRunException; import gov.cdc.usds.simplereport.db.model.DeviceType; +import gov.cdc.usds.simplereport.db.model.DeviceTypeDisease; import gov.cdc.usds.simplereport.db.model.DeviceTypeSpecimenTypeMapping; import gov.cdc.usds.simplereport.db.model.SpecimenType; import gov.cdc.usds.simplereport.db.model.SupportedDisease; import gov.cdc.usds.simplereport.db.repository.DeviceSpecimenTypeNewRepository; +import gov.cdc.usds.simplereport.db.repository.DeviceTypeDiseaseRepository; import gov.cdc.usds.simplereport.db.repository.DeviceTypeRepository; import gov.cdc.usds.simplereport.db.repository.SpecimenTypeRepository; import gov.cdc.usds.simplereport.service.model.reportstream.LIVDResponse; import gov.cdc.usds.simplereport.test_util.SliceTestConfiguration; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -44,6 +47,8 @@ class DeviceTypeServiceIntegrationTest extends BaseServiceTest devices = List.of(newDevice); @@ -136,6 +144,7 @@ void syncDevices_updatesDevices() { var code = codes.get(0); assertThat(code.getTestkitNameId()).isEqualTo("Updated TestKit"); assertThat(code.getEquipmentUid()).isEqualTo("Updated Equip"); + assertThat(code.getEquipmentUidType()).isEqualTo("Updated Equip Type"); } @ParameterizedTest @@ -151,7 +160,8 @@ void syncDevices_createsDevices(String vendorAnalyteName, String expectedDisease "8888888", "0123456", "New TestKit", - "New Equip"); + "New Equip", + "New Equip Uid Type"); List devices = List.of(newDevice); when(dataHubClient.getLIVDTable()).thenReturn(devices); @@ -191,7 +201,8 @@ void syncDevices_updatesSpecimenTypes() { "0123456", "8888888", "TestKit A", - "Equip A"); + "Equip A", + "Equip A Type"); LIVDResponse deviceTwo = new LIVDResponse( devB.getManufacturer(), @@ -201,7 +212,8 @@ void syncDevices_updatesSpecimenTypes() { "0123456", "8888888", "TestKit A", - "Equip A"); + "Equip A", + "Equip A Type"); List devices = List.of(deviceOne, deviceTwo); when(dataHubClient.getLIVDTable()).thenReturn(devices); @@ -237,6 +249,38 @@ void syncDevices_updatesSpecimenTypes() { swab1.getInternalId(), swab3.getInternalId(), newSpecimenType.get().getInternalId()); } + @Test + @SliceTestConfiguration.WithSimpleReportSiteAdminUser + void syncDevices_updatesAssociatedDeviceTypeDiseaseFields() { + LIVDResponse newDevice = + new LIVDResponse( + "Manufacturer A", + "Model A", + List.of(SPECIMEN_DESCRIPTION_ONE), + "influenza A RNA Result", + "7777777", + "8888888", + "Updated TestKit", + "Updated Equip", + "Updated Equip Type"); + + List devices = List.of(newDevice); + + when(dataHubClient.getLIVDTable()).thenReturn(devices); + _service.syncDevices(false); + var updatedDevice = + deviceTypeRepo.findDeviceTypeByManufacturerAndModelAndIsDeletedFalse( + newDevice.getManufacturer(), newDevice.getModel()); + assertTrue(updatedDevice.isPresent()); + + List deviceTypeDiseases = + deviceTypeDiseaseRepository.findAllByDeviceTypeIdIn( + Collections.singleton(updatedDevice.get().getInternalId())); + assertThat(deviceTypeDiseases.get(0).getEquipmentUidType()).isEqualTo("Updated Equip Type"); + assertThat(deviceTypeDiseases.get(0).getEquipmentUid()).isEqualTo("Updated Equip"); + assertThat(deviceTypeDiseases.get(0).getTestkitNameId()).isEqualTo("Updated TestKit"); + } + @Test @SliceTestConfiguration.WithSimpleReportSiteAdminUser void syncDevices_skipsNullUpdates() { @@ -252,7 +296,8 @@ void syncDevices_skipsNullUpdates() { "000000000", "000000000", "TestKit Uid", - "Equipment Uid"); + "Equipment Uid", + "Equipment Uid Type"); List devices = List.of(device); @@ -276,7 +321,8 @@ void syncDevices_skipsInvalidDiseases() { "000000000", "000000000", "TestKit Uid", - "Equipment Uid"); + "Equipment Uid", + "Equipment Uid Type"); List devices = List.of(device); @@ -300,7 +346,8 @@ void syncDevices_avoidsDuplicateDeviceNames() { "000000000", "000000000", "TestKit Uid", - "Equipment Uid"); + "Equipment Uid", + "Equip Uid Type"); List devices = List.of(device); @@ -323,7 +370,8 @@ void syncDevices_skipsConfiguredDevices() { "000000000", "000000000", "TestKit Uid", - "Equipment Uid"); + "Equipment Uid", + "Equipment Uid Type"); List devices = List.of(device); @@ -346,7 +394,8 @@ void syncDevices_skipsForDryRuns() { "8888888", "0123456", "Dry Run TestKit", - "Dry Run Equip"); + "Dry Run Equip", + "Dry Run Equip Type"); List devices = List.of(newDevice); diff --git a/backend/src/test/java/gov/cdc/usds/simplereport/service/DeviceTypeServiceTest.java b/backend/src/test/java/gov/cdc/usds/simplereport/service/DeviceTypeServiceTest.java index fd7dfe98fc..234e98c618 100644 --- a/backend/src/test/java/gov/cdc/usds/simplereport/service/DeviceTypeServiceTest.java +++ b/backend/src/test/java/gov/cdc/usds/simplereport/service/DeviceTypeServiceTest.java @@ -55,7 +55,8 @@ void setup() { _deviceTypeRepoMock, mock(DeviceSpecimenTypeNewRepository.class), mock(SpecimenTypeRepository.class), - mock(SupportedDiseaseRepository.class)); + mock(SupportedDiseaseRepository.class), + mock(DeviceTypeDiseaseRepository.class)); } @Test @@ -128,6 +129,7 @@ void createDuplicateDeviceType_error() { .supportedDisease(disease.getInternalId()) .testPerformedLoincCode("loinc1") .equipmentUid("equipmentUid1") + .equipmentUidType("equipmentUidType1") .testkitNameId("testkitNameId1") .testOrderedLoincCode("loinc3") .build())) @@ -170,6 +172,7 @@ void createAndDeleteDeviceTypes_withSupportedDiseaseTestPerformed_adminUser_succ .supportedDisease(disease1.getInternalId()) .testPerformedLoincCode("loinc1") .equipmentUid("equipmentUid1") + .equipmentUidType("equipmentUidType1") .testkitNameId("testkitNameId1") .testOrderedLoincCode("loinc3") .build())) @@ -188,6 +191,7 @@ void createAndDeleteDeviceTypes_withSupportedDiseaseTestPerformed_adminUser_succ .supportedDisease(disease2.getInternalId()) .testPerformedLoincCode("loinc2") .equipmentUid("equipmentUid2") + .equipmentUidType("equipmentUidType2") .testkitNameId("testkitNameId2") .testOrderedLoincCode("loinc3") .build())) @@ -254,6 +258,7 @@ void updateDeviceTypeName_adminUser_success() { .supportedDisease(disease1.getInternalId()) .testPerformedLoincCode("loinc1") .equipmentUid("equipmentUid1") + .equipmentUidType("equipmentUidType1") .testkitNameId("testkitNameId1") .testOrderedLoincCode("loinc3") .build())) @@ -308,6 +313,56 @@ void updateDeviceTypeName_adminUser_success() { assertThat(updatedSwabTypes.get(0).getName()).isEqualTo("Mouth"); } + @Test + @WithSimpleReportSiteAdminUser + void updateDeviceEquipmentUidType_adminUser_success() { + // GIVEN + SpecimenType swab1 = specimenTypeRepository.save(new SpecimenType("Nose", "111222333")); + SupportedDisease disease1 = _diseaseService.covid(); + + DeviceType device = + _service.createDeviceType( + CreateDeviceType.builder() + .name("A") + .model("B") + .manufacturer("C") + .swabTypes(List.of(swab1.getInternalId())) + .supportedDiseaseTestPerformed( + List.of( + SupportedDiseaseTestPerformedInput.builder() + .supportedDisease(disease1.getInternalId()) + .testPerformedLoincCode("loinc1") + .equipmentUid("equipmentUid1") + .equipmentUidType("equipmentUidType1") + .testkitNameId("testkitNameId1") + .testOrderedLoincCode("loinc3") + .build())) + .testLength(10) + .build()); + + UpdateDeviceType deviceUpdate = + UpdateDeviceType.builder() + .internalId(device.getInternalId()) + .supportedDiseaseTestPerformed( + List.of( + SupportedDiseaseTestPerformedInput.builder() + .supportedDisease(disease1.getInternalId()) + .testPerformedLoincCode("loinc1") + .equipmentUid("equipmentUid1") + .testkitNameId("testkitNameId1") + .testOrderedLoincCode("loinc3") + .equipmentUidType("equipmentUidType2") + .build())) + .build(); + DeviceType updatedDevice = _service.updateDeviceType(deviceUpdate); + + // THEN + assertEquals( + "equipmentUidType2", + updatedDevice.getSupportedDiseaseTestPerformed().get(0).getEquipmentUidType()); + assertThat(updatedDevice.getSupportedDiseaseTestPerformed()).hasSize(1); + } + @Test @WithSimpleReportSiteAdminUser void updateDeviceTypeSupportedDiseaseTestPerformed_adminUser_success() { @@ -329,6 +384,7 @@ void updateDeviceTypeSupportedDiseaseTestPerformed_adminUser_success() { .supportedDisease(disease1.getInternalId()) .testPerformedLoincCode("loinc1") .equipmentUid("equipmentUid1") + .equipmentUidType("equipmentUidType1") .testkitNameId("testkitNameId1") .testOrderedLoincCode("loinc3") .build())) @@ -401,6 +457,16 @@ void updateDeviceTypeName_adminUser_success_no_changes() { // GIVEN SpecimenType swab1 = specimenTypeRepository.save(new SpecimenType("Nose", "111222333")); SupportedDisease disease1 = _diseaseService.covid(); + List supportedDiseaseInput = + List.of( + SupportedDiseaseTestPerformedInput.builder() + .supportedDisease(disease1.getInternalId()) + .testPerformedLoincCode("loinc2") + .equipmentUid("equipmentUid2") + .equipmentUidType("equipmentUidType1") + .testkitNameId("testkitNameId2") + .testOrderedLoincCode("loinc3") + .build()); DeviceType device = _service.createDeviceType( @@ -409,22 +475,17 @@ void updateDeviceTypeName_adminUser_success_no_changes() { .model("B") .manufacturer("C") .swabTypes(List.of(swab1.getInternalId())) - .supportedDiseaseTestPerformed( - List.of( - SupportedDiseaseTestPerformedInput.builder() - .supportedDisease(disease1.getInternalId()) - .testPerformedLoincCode("loinc2") - .equipmentUid("equipmentUid2") - .testkitNameId("testkitNameId2") - .testOrderedLoincCode("loinc3") - .build())) + .supportedDiseaseTestPerformed(supportedDiseaseInput) .testLength(15) .build()); // WHEN DeviceType updatedDevice = _service.updateDeviceType( - UpdateDeviceType.builder().internalId(device.getInternalId()).build()); + UpdateDeviceType.builder() + .internalId(device.getInternalId()) + .supportedDiseaseTestPerformed(supportedDiseaseInput) + .build()); // THEN assertEquals(updatedDevice.getInternalId(), device.getInternalId()); diff --git a/backend/src/test/java/gov/cdc/usds/simplereport/test_util/TestDataBuilder.java b/backend/src/test/java/gov/cdc/usds/simplereport/test_util/TestDataBuilder.java index 916509f309..92a4601dd8 100644 --- a/backend/src/test/java/gov/cdc/usds/simplereport/test_util/TestDataBuilder.java +++ b/backend/src/test/java/gov/cdc/usds/simplereport/test_util/TestDataBuilder.java @@ -122,6 +122,7 @@ public static DeviceTypeDisease createDeviceTypeDisease(SupportedDisease support supportedDisease, supportedDisease.getLoinc(), "543212134", + "MNI", "BOOMX2", "95422-2"); } @@ -133,6 +134,7 @@ public static DeviceTypeDisease createDeviceTypeDiseaseForBulkUpload( supportedDisease, supportedDisease.getLoinc(), "543212134", + "MNI", "BOOMX2", "94534-5"); } @@ -144,6 +146,7 @@ public static DeviceTypeDisease createDeviceTypeDisease() { supportedDisease, supportedDisease.getLoinc(), "543212134", + "MNI", "BOOMX2", "98670-3"); } diff --git a/frontend/src/generated/graphql.tsx b/frontend/src/generated/graphql.tsx index 5bd127f041..1a69e2be0b 100644 --- a/frontend/src/generated/graphql.tsx +++ b/frontend/src/generated/graphql.tsx @@ -881,6 +881,7 @@ export type SupportedDisease = { export type SupportedDiseaseTestPerformed = { __typename?: "SupportedDiseaseTestPerformed"; equipmentUid?: Maybe; + equipmentUidType?: Maybe; supportedDisease: SupportedDisease; testOrderedLoincCode?: Maybe; testPerformedLoincCode: Scalars["String"]["output"]; @@ -889,6 +890,7 @@ export type SupportedDiseaseTestPerformed = { export type SupportedDiseaseTestPerformedInput = { equipmentUid?: InputMaybe; + equipmentUidType?: InputMaybe; supportedDisease: Scalars["ID"]["input"]; testOrderedLoincCode?: InputMaybe; testPerformedLoincCode: Scalars["String"]["input"];