Fixing merge conflicts

Author: clewellyn-nava

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

@@ -6,6 +6,7 @@
 import gov.cms.bfd.server.ng.DbFilter;
 import gov.cms.bfd.server.ng.DbFilterBuilder;
 import gov.cms.bfd.server.ng.DbFilterParam;
+import gov.cms.bfd.server.ng.claim.model.PriorAuthorization;
 import gov.cms.bfd.server.ng.claim.model.common.SystemType;
 import gov.cms.bfd.server.ng.claim.model.common.entities.ClaimBase;
 import gov.cms.bfd.server.ng.input.ClaimSearchCriteria;

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

@@ -2,6 +2,7 @@
 
 import gov.cms.bfd.server.ng.DbFilterBuilder;
 import gov.cms.bfd.server.ng.claim.filter.*;
+import gov.cms.bfd.server.ng.claim.model.PriorAuthorization;
 import gov.cms.bfd.server.ng.claim.model.common.SystemType;
 import gov.cms.bfd.server.ng.claim.model.common.entities.ClaimBase;
 import gov.cms.bfd.server.ng.claim.model.institutional.entities.ClaimInstitutionalCmsNch;

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

@@ -1,5 +1,9 @@
 package gov.cms.bfd.server.ng.claim.model;
 
+import gov.cms.bfd.server.ng.claim.model.common.CareTeamType;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimContext;
+import gov.cms.bfd.server.ng.claim.model.common.ProviderFhirHelper;
+import gov.cms.bfd.server.ng.claim.model.common.ProviderHistoryBase;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
@@ -16,18 +20,18 @@ class AttendingPhysicianCareTeam extends ProviderHistoryBase {
   private Optional<Integer> npiType;
 
   @Override
-  protected CareTeamType getCareTeamType() {
+  public CareTeamType getCareTeamType() {
     return CareTeamType.ATTENDING;
   }
 
   @Override
   @Transient
-  protected ProviderHistoryBase.NpiType getNpiType() {
+  public ProviderHistoryBase.NpiType getNpiType() {
     return ProviderHistoryBase.NpiType.fromNpiTypeCode(npiType);
   }
 
   @Override
-  Optional<ExplanationOfBenefit.CareTeamComponent> toFhirCareTeamComponent(
+  public Optional<ExplanationOfBenefit.CareTeamComponent> toFhirCareTeamComponent(
       Integer sequence, Optional<ClaimContext> claimContext) {
     return getProviderNpiNumber()
         .flatMap(

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

@@ -1,5 +1,6 @@
 package gov.cms.bfd.server.ng.claim.model;
 
+import gov.cms.bfd.server.ng.claim.model.common.ClaimType;
 import gov.cms.bfd.server.ng.util.SystemUrls;
 import java.util.Arrays;
 import java.util.Optional;

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

@@ -1,5 +1,9 @@
 package gov.cms.bfd.server.ng.claim.model;
 
+import gov.cms.bfd.server.ng.claim.model.common.CareTeamType;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimContext;
+import gov.cms.bfd.server.ng.claim.model.common.ProviderFhirHelper;
+import gov.cms.bfd.server.ng.claim.model.common.ProviderHistoryBase;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
@@ -17,18 +21,18 @@ class OrderingOrReferringCareTeam extends ProviderHistoryBase {
   private Optional<Integer> npiType;
 
   @Override
-  protected CareTeamType getCareTeamType() {
+  public CareTeamType getCareTeamType() {
     return CareTeamType.REFERRING;
   }
 
   @Override
   @Transient
-  protected ProviderHistoryBase.NpiType getNpiType() {
+  public ProviderHistoryBase.NpiType getNpiType() {
     return ProviderHistoryBase.NpiType.fromNpiTypeCode(npiType);
   }
 
   @Override
-  Optional<ExplanationOfBenefit.CareTeamComponent> toFhirCareTeamComponent(
+  public Optional<ExplanationOfBenefit.CareTeamComponent> toFhirCareTeamComponent(
       Integer sequence, Optional<ClaimContext> claimContext) {
     return getProviderNpiNumber()
         .flatMap(

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

@@ -1,5 +1,9 @@
 package gov.cms.bfd.server.ng.claim.model;
 
+import gov.cms.bfd.server.ng.claim.model.common.CareTeamType;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimContext;
+import gov.cms.bfd.server.ng.claim.model.common.ProviderFhirHelper;
+import gov.cms.bfd.server.ng.claim.model.common.ProviderHistoryBase;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
@@ -16,18 +20,18 @@ class PriorAuthRenderingCareTeam extends ProviderHistoryBase {
   private Optional<Integer> npiType;
 
   @Override
-  protected CareTeamType getCareTeamType() {
+  public CareTeamType getCareTeamType() {
     return CareTeamType.RENDERING;
   }
 
   @Override
   @Transient
-  protected ProviderHistoryBase.NpiType getNpiType() {
+  public ProviderHistoryBase.NpiType getNpiType() {
     return ProviderHistoryBase.NpiType.fromNpiTypeCode(npiType);
   }
 
   @Override
-  Optional<ExplanationOfBenefit.CareTeamComponent> toFhirCareTeamComponent(
+  public Optional<ExplanationOfBenefit.CareTeamComponent> toFhirCareTeamComponent(
       Integer sequence, Optional<ClaimContext> claimContext) {
     return getProviderNpiNumber()
         .flatMap(

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

@@ -1,6 +1,13 @@
 package gov.cms.bfd.server.ng.claim.model;
 
 import gov.cms.bfd.server.ng.beneficiary.model.BeneficiarySimple;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimContractorNumber;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimState;
+import gov.cms.bfd.server.ng.claim.model.common.MetaSourceSk;
+import gov.cms.bfd.server.ng.claim.model.common.OrganizationFactory;
+import gov.cms.bfd.server.ng.claim.model.common.PatientReferenceFactory;
+import gov.cms.bfd.server.ng.claim.model.common.ProviderFhirHelper;
+import gov.cms.bfd.server.ng.claim.model.common.SupportingInfoFactory;
 import gov.cms.bfd.server.ng.util.DateUtil;
 import gov.cms.bfd.server.ng.util.SequenceGenerator;
 import gov.cms.bfd.server.ng.util.SystemUrls;

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

@@ -1,5 +1,7 @@
 package gov.cms.bfd.server.ng.claim.model;
 
+import gov.cms.bfd.server.ng.claim.model.common.ClaimLineRevenueCenterCode;
+import gov.cms.bfd.server.ng.claim.model.common.ClaimPlaceOfServiceCode;
 import jakarta.persistence.*;
 import java.util.Optional;
 import lombok.EqualsAndHashCode;

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

@@ -3,6 +3,7 @@
 import static gov.cms.bfd.server.ng.util.SystemUrls.PROFILE_PRIOR_AUTH;
 
 import gov.cms.bfd.server.ng.ClaimSecurityStatus;
+import gov.cms.bfd.server.ng.claim.model.common.MetaSourceSk;
 import gov.cms.bfd.server.ng.util.DateUtil;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;

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

@@ -1,5 +1,7 @@
 package gov.cms.bfd.server.ng.claim.model;
 
+import gov.cms.bfd.server.ng.claim.model.common.CarinSupportingInfoCategory;
+import gov.cms.bfd.server.ng.claim.model.common.SupportingInfoFactory;
 import gov.cms.bfd.server.ng.util.SystemUrls;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;