Finish movement of payment component into leaf entities

Author: clewellyn-nava

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

@@ -13,7 +13,7 @@
  */
 @Embeddable
 @Getter
-public class ClaimPaymentComponent {
+public class ClaimPaymentComponent implements ClaimPaymentComponentBase {
   @Column(name = "clm_pd_dt")
   private Optional<LocalDate> paymentDate;
 
@@ -22,6 +22,7 @@ public class ClaimPaymentComponent {
    *
    * @return an optional PaymentComponent if a date exists
    */
+  @Override
   public Optional<ExplanationOfBenefit.PaymentComponent> toFhir() {
     return paymentDate.map(
         d -> new ExplanationOfBenefit.PaymentComponent().setDate(DateUtil.toDate(d)));

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

@@ -12,7 +12,7 @@
 /** ExplanationOfBeneift.PaymentComponent A payment component with a payment attached to it. */
 @Embeddable
 @Getter
-public class ClaimPaymentComponentAmount {
+public class ClaimPaymentComponentAmount implements ClaimPaymentComponentBase {
   @Embedded private ClaimPaymentComponent base;
 
   @Column(name = "clm_pmt_amt")
@@ -23,6 +23,7 @@ public class ClaimPaymentComponentAmount {
    *
    * @return a PaymentComponent with an amount and optional date
    */
+  @Override
   public Optional<ExplanationOfBenefit.PaymentComponent> toFhir() {
     var payment = new ExplanationOfBenefit.PaymentComponent().setAmount(USD.toFhir(paymentAmount));
     base.getPaymentDate().ifPresent(d -> payment.setDate(DateUtil.toDate(d)));

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

@@ -0,0 +1,15 @@
+package gov.cms.bfd.server.ng.claim.model.common;
+
+import java.util.Optional;
+import org.hl7.fhir.r4.model.ExplanationOfBenefit;
+
+/** Interface for an ExplanationofBenefit.PaymentComponent. */
+public interface ClaimPaymentComponentBase {
+
+  /**
+   * toFhir().
+   *
+   * @return an ExplanationOfBenefit.PaymentComponent
+   */
+  Optional<ExplanationOfBenefit.PaymentComponent> toFhir();
+}

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/common/entities/ClaimBase.java

@@ -8,6 +8,7 @@
 import gov.cms.bfd.server.ng.claim.model.common.ClaimIdrLoadDate;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimItemBase;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimPaidStatusCode;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimPaymentComponentBase;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimRelatedCondition;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimSourceId;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimState;
@@ -45,8 +46,8 @@
  */
 @Getter
 @MappedSuperclass
-@SuppressWarnings({"JpaAttributeTypeInspection"})
 public abstract class ClaimBase {
+
   @Id
   @Column(name = "clm_uniq_id", insertable = false, updatable = false)
   private long claimUniqueId;
@@ -139,6 +140,13 @@ protected ExplanationOfBenefit sortedEob(ExplanationOfBenefit eob) {
     return eob;
   }
 
+  /**
+   * Hook method for payment component information, shared across all claims.
+   *
+   * @return The class data for a PaymentComponent
+   */
+  public abstract ClaimPaymentComponentBase getPaymentComponent();
+
   /**
    * Return the claim source id.
    *

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/institutional/entities/ClaimInstitutionalBase.java

@@ -8,7 +8,6 @@
 import gov.cms.bfd.server.ng.claim.model.common.BenefitEnhancementCodes;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimContractorNumber;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimDispositionCode;
-import gov.cms.bfd.server.ng.claim.model.common.ClaimPaymentComponentAmount;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimProcedureBase;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimQueryCode;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimRecordType;
@@ -54,7 +53,6 @@ public abstract class ClaimInstitutionalBase extends ClaimBase {
 
   @Embedded private NchPrimaryPayorCode nchPrimaryPayorCode;
   @Embedded private TypeOfBillCode typeOfBillCode;
-  @Embedded private ClaimPaymentComponentAmount paymentComponent;
   @Embedded private DiagnosisDrgCode diagnosisDrgCode;
   @Embedded private BillingProviderInstitutional billingProviderHistory;
   @Embedded private OtherInstitutionalCareTeam otherProviderHistory;

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/institutional/entities/ClaimInstitutionalBasisBase.java

@@ -2,13 +2,16 @@
 
 import gov.cms.bfd.server.ng.claim.model.common.AdjudicationChargeBase;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimItemBase;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimPaymentComponent;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimPaymentComponentBase;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimRecordType;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimRelatedCondition;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimSourceId;
 import gov.cms.bfd.server.ng.claim.model.common.MetaSourceSk;
 import gov.cms.bfd.server.ng.claim.model.common.SupportingInfoComponentBase;
 import gov.cms.bfd.server.ng.claim.model.institutional.ClaimValue;
 import gov.cms.bfd.server.ng.util.SequenceGenerator;
+import jakarta.persistence.Embedded;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -77,4 +80,16 @@ public SortedSet<ClaimItemBase> getItems() {
   public Optional<ClaimRelatedCondition> getClaimRelatedCondition() {
     return Optional.empty();
   }
+
+  // region PaymentComponent
+
+  // Basis does not have a payment amount, just the date
+  @Embedded private ClaimPaymentComponent paymentComponent;
+
+  @Override
+  public ClaimPaymentComponentBase getPaymentComponent() {
+    return paymentComponent;
+  }
+
+  // endregion
 }

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/institutional/entities/ClaimInstitutionalCmsBase.java

@@ -1,6 +1,8 @@
 package gov.cms.bfd.server.ng.claim.model.institutional.entities;
 
 import gov.cms.bfd.server.ng.claim.model.common.ClaimIdrLoadDate;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimPaymentComponentAmount;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimPaymentComponentBase;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.MappedSuperclass;
 import java.util.Optional;
@@ -14,7 +16,18 @@ public abstract class ClaimInstitutionalCmsBase extends ClaimInstitutionalBase {
 
   @Override
   public Optional<ClaimIdrLoadDate> getClaimIdrLoadDate() {
-    return Optional.ofNullable(claimIdrLoadDate);
+    return Optional.of(claimIdrLoadDate);
   }
+
+  // endregion
+
+  // region PaymentComponent
+  @Embedded private ClaimPaymentComponentAmount paymentComponent;
+
+  @Override
+  public ClaimPaymentComponentBase getPaymentComponent() {
+    return paymentComponent;
+  }
+
   // endregion
 }

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/institutional/entities/ClaimInstitutionalRegularBase.java

@@ -2,13 +2,16 @@
 
 import gov.cms.bfd.server.ng.claim.model.common.AdjudicationChargeBase;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimItemBase;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimPaymentComponentAmount;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimPaymentComponentBase;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimRecordType;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimRelatedCondition;
 import gov.cms.bfd.server.ng.claim.model.common.ClaimSourceId;
 import gov.cms.bfd.server.ng.claim.model.common.MetaSourceSk;
 import gov.cms.bfd.server.ng.claim.model.common.SupportingInfoComponentBase;
 import gov.cms.bfd.server.ng.claim.model.institutional.ClaimValue;
 import gov.cms.bfd.server.ng.util.SequenceGenerator;
+import jakarta.persistence.Embedded;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -77,4 +80,14 @@ public SortedSet<ClaimItemBase> getItems() {
   public Optional<ClaimRelatedCondition> getClaimRelatedCondition() {
     return Optional.empty();
   }
+
+  // region PaymentComponent
+  @Embedded private ClaimPaymentComponentAmount paymentComponent;
+
+  @Override
+  public ClaimPaymentComponentBase getPaymentComponent() {
+    return paymentComponent;
+  }
+
+  // endregion
 }

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/institutional/entities/ClaimInstitutionalRegularNch.java

@@ -1,7 +1,13 @@
 package gov.cms.bfd.server.ng.claim.model.institutional.entities;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import javax.annotation.processing.Generated;
+import lombok.Getter;
 
 /** The institutional claim, regular profile, sourced from nch. */
+@Getter
+@Entity
+@Table(name = "claim_institutional_nch", schema = "idr")
 @Generated("TODO - Remove after query optimization implementation")
 public abstract class ClaimInstitutionalRegularNch extends ClaimInstitutionalRegularBase {}

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/institutional/entities/ClaimInstitutionalRegularSharedSystems.java

@@ -1,7 +1,13 @@
 package gov.cms.bfd.server.ng.claim.model.institutional.entities;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import javax.annotation.processing.Generated;
+import lombok.Getter;
 
 /** The institutional claim, regular profile, sourced from shared systems. */
+@Getter
+@Entity
+@Table(name = "claim_institutional_ss", schema = "idr")
 @Generated("TODO - Remove after query optimization implementation")
 public class ClaimInstitutionalRegularSharedSystems extends ClaimInstitutionalRegularBase {}