Switch client and plate id from uuid to string

Author: nickpalladino

src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/PlateEntity.java

@@ -19,7 +19,7 @@
 @Where(clause = "soft_deleted = false")
 public class PlateEntity extends BrAPIPrimaryEntity {
     @Column
-    private UUID clientPlateDbId;
+    private String clientPlateDbId;
     @Column
     private String clientPlateBarcode;
     @Column
@@ -93,10 +93,10 @@ public VendorPlateSubmissionEntity getSubmission() {
 	public void setSubmission(VendorPlateSubmissionEntity submission) {
 		this.submission = submission;
 	}
-	public UUID getClientPlateDbId() {
+	public String getClientPlateDbId() {
 		return clientPlateDbId;
 	}
-	public void setClientPlateDbId(UUID clientPlateDbId) {
+	public void setClientPlateDbId(String clientPlateDbId) {
 		this.clientPlateDbId = clientPlateDbId;
 	}
 	public String getClientPlateBarcode() {

src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorOrderEntity.java

@@ -14,7 +14,7 @@
 @Table(name = "vendor_order")
 public class VendorOrderEntity extends BrAPIPrimaryEntity {
     @Column
-    private UUID clientPlateDbId;
+    private String clientPlateDbId;
     @Column
     private String clientPlateBarcode;
     @Column
@@ -73,11 +73,11 @@ public void setPlateSubmission(VendorPlateSubmissionEntity plateSubmission) {
         this.plateSubmission = plateSubmission;
     }
 
-    public UUID getClientPlateDbId() {
+    public String getClientPlateDbId() {
         return clientPlateDbId;
     }
 
-    public void setClientPlateDbId(UUID clientPlateDbId) {
+    public void setClientPlateDbId(String clientPlateDbId) {
         this.clientPlateDbId = clientPlateDbId;
     }
 

src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/vendor/VendorPlateSubmissionEntity.java

@@ -13,7 +13,7 @@
 public class VendorPlateSubmissionEntity extends BrAPIPrimaryEntity {
 
     @Column
-    private UUID clientId;
+    private String clientId;
     @Column
     private Integer numberOfSamples;
     @Column
@@ -30,10 +30,10 @@ public VendorOrderEntity getOrder() {
 	public void setOrder(VendorOrderEntity order) {
 		this.order = order;
 	}
-	public UUID getClientId() {
+	public String getClientId() {
 		return clientId;
 	}
-	public void setClientId(UUID clientId) {
+	public void setClientId(String clientId) {
 		this.clientId = clientId;
 	}
 	public Integer getNumberOfSamples() {

src/main/java/org/brapi/test/BrAPITestServer/service/geno/VendorSampleService.java

@@ -161,7 +161,7 @@ private VendorPlateSubmissionPlates convertFromEntityToSummary(PlateEntity entit
 	private VendorOrderEntity convertToEntity(VendorOrderSubmissionRequest request) {
 		VendorOrderEntity entity = new VendorOrderEntity();
 		entity.setClientPlateBarcode(request.getClientId());
-		entity.setClientPlateDbId(UUID.fromString(request.getClientId()));
+		entity.setClientPlateDbId(request.getClientId());
 		entity.setRequiredServiceInfo(request.getRequiredServiceInfo());
 		entity.setSampleType(request.getSampleType());
 		entity.setServiceIds(request.getServiceIds());
@@ -190,7 +190,7 @@ private VendorPlateSubmissionEntity convertToEntity(VendorOrderSubmissionRequest
 
 	private PlateEntity convertToEntity(VendorPlateSubmissionRequestPlates newPlate) {
 		PlateEntity plateEntity = new PlateEntity();
-		plateEntity.setClientPlateDbId(UUID.fromString(newPlate.getClientPlateId()));
+		plateEntity.setClientPlateDbId(newPlate.getClientPlateId());
 		plateEntity.setStatusTimeStamp(new Date());
 
 		return plateEntity;
@@ -199,7 +199,7 @@ private PlateEntity convertToEntity(VendorPlateSubmissionRequestPlates newPlate)
 	private VendorOrderEntity convertToEntity(VendorPlateSubmissionRequest request) {
 		VendorOrderEntity entity = new VendorOrderEntity();
 		entity.setClientPlateBarcode(request.getClientId());
-		entity.setClientPlateDbId(UUID.fromString(request.getClientId()));
+		entity.setClientPlateDbId(request.getClientId());
 		entity.setSampleType(request.getSampleType());
 		entity.setStatus(StatusEnum.RECEIVED);
 		entity.setStatusTimeStamp(new Date());

src/main/resources/db/migration/V003__client_and_plate_id_to_string.sql

@@ -0,0 +1,32 @@
+-- See the NOTICE file distributed with this work for additional information
+-- regarding copyright ownership.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+-- change client_plate_db_id back to text instead of forcing uuid
+ALTER TABLE vendor_order
+ALTER COLUMN client_plate_db_id
+    TYPE text
+    USING client_plate_db_id::text;
+
+-- change client_id back to text instead of forcing uuid
+ALTER TABLE plate_submission
+ALTER COLUMN client_id
+    TYPE text
+    USING client_id::text;
+
+-- change client_plate_db_id back to text instead of forcing uuid
+ALTER TABLE plate
+ALTER COLUMN client_plate_db_id
+    TYPE text
+    USING client_plate_db_id::text;