optional field

Author: aschey-forpeople

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/converter/ClaimLineDeductibleCoinsuranceCodeConverter.java

@@ -3,20 +3,23 @@
 import gov.cms.bfd.server.ng.claim.model.ClaimLineDeductibleCoinsuranceCode;
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
+import java.util.Optional;
 
 /** Database code converter. */
 @Converter(autoApply = true)
 public class ClaimLineDeductibleCoinsuranceCodeConverter
-    implements AttributeConverter<ClaimLineDeductibleCoinsuranceCode, String> {
+    implements AttributeConverter<Optional<ClaimLineDeductibleCoinsuranceCode>, String> {
   @Override
   public String convertToDatabaseColumn(
-      ClaimLineDeductibleCoinsuranceCode claimLineDeductibleCoinsuranceCode) {
+      Optional<ClaimLineDeductibleCoinsuranceCode> claimLineDeductibleCoinsuranceCode) {
     // This is a read-only API so this method will never actually persist anything to the database.
-    return claimLineDeductibleCoinsuranceCode.getCode();
+    return claimLineDeductibleCoinsuranceCode
+        .map(ClaimLineDeductibleCoinsuranceCode::getCode)
+        .orElse("");
   }
 
   @Override
-  public ClaimLineDeductibleCoinsuranceCode convertToEntityAttribute(String idrCode) {
-    return ClaimLineDeductibleCoinsuranceCode.fromCode(idrCode);
+  public Optional<ClaimLineDeductibleCoinsuranceCode> convertToEntityAttribute(String idrCode) {
+    return ClaimLineDeductibleCoinsuranceCode.tryFromCode(idrCode);
   }
 }

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ClaimLine.java

@@ -63,7 +63,7 @@ ExplanationOfBenefit.ItemComponent toFhir() {
     revenueCenterCode.ifPresent(
         c -> {
           var revenueCoding =
-              c.toFhir(institutional.map(ClaimLineInstitutional::getDeductibleCoinsuranceCode));
+              c.toFhir(institutional.flatMap(ClaimLineInstitutional::getDeductibleCoinsuranceCode));
           line.setRevenue(revenueCoding);
         });
 

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ClaimLineDeductibleCoinsuranceCode.java

@@ -2,6 +2,7 @@
 
 import gov.cms.bfd.server.ng.SystemUrls;
 import java.util.Arrays;
+import java.util.Optional;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.hl7.fhir.r4.model.Coding;
@@ -42,8 +43,8 @@ public enum ClaimLineDeductibleCoinsuranceCode {
    * @param code database code
    * @return coinsurance code
    */
-  public static ClaimLineDeductibleCoinsuranceCode fromCode(String code) {
-    return Arrays.stream(values()).filter(v -> v.code.equals(code)).findFirst().get();
+  public static Optional<ClaimLineDeductibleCoinsuranceCode> tryFromCode(String code) {
+    return Arrays.stream(values()).filter(v -> v.code.equals(code)).findFirst();
   }
 
   Coding toFhir() {

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ClaimLineInstitutional.java

@@ -20,7 +20,7 @@ public class ClaimLineInstitutional {
   @EmbeddedId ClaimLineInstitutionalId claimLineInstitutionalId;
 
   @Column(name = "clm_ddctbl_coinsrnc_cd")
-  private ClaimLineDeductibleCoinsuranceCode deductibleCoinsuranceCode;
+  private Optional<ClaimLineDeductibleCoinsuranceCode> deductibleCoinsuranceCode;
 
   @Column(name = "clm_line_instnl_rev_ctr_dt")
   private LocalDate revenueCenterDate;