Conflicts resolution fixes, pt 2

Author: aafa

phoenix-scala/phoenix/app/phoenix/models/cord/OrderPayment.scala

@@ -6,7 +6,7 @@ import core.db._
 import core.failures.Failure
 import core.utils.Money._
 import core.utils.Validation._
-import failures.Failure
+import core.failures.Failure
 import phoenix.models.cord.OrderPayments.filter
 import phoenix.models.payment.PaymentMethod
 import phoenix.models.payment.PaymentMethod.ExternalPayment
@@ -16,10 +16,8 @@ import phoenix.models.payment.giftcard.{GiftCard, GiftCards}
 import phoenix.models.payment.storecredit.{StoreCredit, StoreCredits}
 import phoenix.utils.aliases.stripe.StripeCustomer
 import shapeless._
-import utils.Money._
-import utils.Validation._
-import utils.db.ExPostgresDriver.api._
-import utils.db._
+import core.db.ExPostgresDriver.api._
+import core.db._
 
 case class OrderPayment(id: Int = 0,
                         // FIXME @anna WTF is wrong with these defaults?

phoenix-scala/phoenix/app/phoenix/models/payment/ExternalCharge.scala

@@ -1,11 +1,11 @@
 package phoenix.models.payment
 
 import com.pellucid.sealerate
-import failures.Failures
+import core.failures.Failures
 import phoenix.models.payment.ExternalCharge.State
 import slick.ast.BaseTypedType
 import slick.jdbc.JdbcType
-import utils.db.FoxModel
+import core.db._
 import phoenix.utils.{ADT, FSM}
 
 trait ExternalChargeVals {

phoenix-scala/phoenix/app/phoenix/models/payment/applepay/ApplePayCharge.scala

@@ -9,8 +9,8 @@ import phoenix.utils.aliases.stripe.StripeCharge
 import shapeless.{Lens, lens}
 import slick.jdbc.PostgresProfile.api._
 import slick.lifted._
-import utils.Money.Currency
-import utils.db._
+import core.utils.Money.Currency
+import core.db._
 
 case class ApplePayCharge(id: Int = 0,
                           orderPaymentId: Int,

phoenix-scala/phoenix/app/phoenix/models/payment/applepay/ApplePayment.scala

@@ -4,12 +4,12 @@ import java.time.Instant
 
 import cats.implicits._
 import cats.data.ValidatedNel
-import failures.Failure
+import core.db._
+import core.failures.Failure
+import core.utils.Validation
 import phoenix.models.payment.PaymentMethod
 import shapeless.{Lens, lens}
 import slick.jdbc.PostgresProfile.api._
-import utils.Validation
-import utils.db._
 
 case class ApplePayment(
     id: Int = 0,

phoenix-scala/phoenix/app/phoenix/models/payment/creditcard/CreditCardCharge.scala

@@ -1,7 +1,7 @@
 package phoenix.models.payment.creditcard
 
 import java.time.Instant
-import failures.Failures
+import core.failures.Failures
 import com.pellucid.sealerate
 import core.db._
 import core.failures.Failures
@@ -12,11 +12,11 @@ import phoenix.models.payment.ExternalCharge._
 import phoenix.utils._
 import phoenix.utils.aliases.stripe._
 import shapeless._
-import utils.Money.Currency
+import core.utils.Money.Currency
 import slick.ast.BaseTypedType
 import slick.jdbc.JdbcType
 import slick.jdbc.PostgresProfile.api._
-import utils.db._
+import core.db._
 
 case class CreditCardCharge(id: Int = 0,
                             creditCardId: Int,

phoenix-scala/phoenix/app/phoenix/models/returns/ReturnCcPayment.scala

@@ -4,8 +4,8 @@ import phoenix.models.payment.applepay.ApplePayCharges
 import phoenix.models.payment.creditcard.CreditCardCharges
 import shapeless._
 import slick.jdbc.PostgresProfile.api._
-import utils.Money.Currency
-import utils.db._
+import core.db._
+import core.utils.Money.Currency
 
 case class ReturnStripePayment(id: Int = 0,
                                returnPaymentId: Int,

phoenix-scala/phoenix/app/phoenix/models/returns/ReturnStripePayment.scala

@@ -3,7 +3,7 @@ package phoenix.services
 import cats.implicits._
 import com.github.tminglei.slickpg.LTree
 import core.failures.GeneralFailure
-import failures.GeneralFailure
+import core.failures.GeneralFailure
 import phoenix.failures.PromotionFailures.PromotionNotFoundForContext
 import phoenix.failures.ShippingMethodFailures.NoDefaultShippingMethod
 import objectframework.ObjectUtils

phoenix-scala/phoenix/app/phoenix/services/Checkout.scala

@@ -10,7 +10,7 @@ import phoenix.models.payment.storecredit.StoreCreditAdjustments
 import phoenix.utils.aliases.EC
 import phoenix.models.payment.applepay.ApplePayCharges
 import slick.dbio.DBIO
-import utils.db._
+import core.db._
 
 trait CordQueries {
 

phoenix-scala/phoenix/app/phoenix/services/CordQueries.scala

@@ -2,7 +2,7 @@ package phoenix.services.returns
 
 import cats.implicits._
 import core.db._
-import failures.GeneralFailure
+import core.failures.GeneralFailure
 import phoenix.failures.OrderFailures.{OnlyOneExternalPaymentIsAllowed, OrderPaymentNotFoundFailure}
 import phoenix.failures.ReturnFailures._
 import phoenix.models.account.{Scope, User, Users}
@@ -21,7 +21,7 @@ import phoenix.utils.aliases._
 import phoenix.utils.apis.{Apis, RefundReason}
 import slick.jdbc.PostgresProfile.api._
 import scala.annotation.tailrec
-import utils.db._
+import core.db._
 import phoenix.models.payment.applepay.ApplePayments
 
 object ReturnPaymentManager {
@@ -337,16 +337,16 @@ object ReturnPaymentManager {
       ((id: String, amount: Int) ⇒
          for {
            _ ← * <~ apis.stripe.authorizeRefund(id, amount, RefundReason.RequestedByCustomer)
-           ccPayment = ReturnCcPayment(
+           ccPayment = ReturnStripePayment(
                returnPaymentId = payment.id,
                chargeId = id,
                returnId = payment.returnId,
                amount = amount,
                currency = payment.currency
            )
-           created ← * <~ ReturnCcPayments.create(ccPayment)
+           created ← * <~ ReturnStripePayments.create(ccPayment)
          } yield created).tupled
-        .andThen(_.runTxn()) // we want to run each stripe refund in separate transaction to avoid any rollback of `ReturnCcPayments` table
+        .andThen(_.runTxn()) // we want to run each stripe refund in separate transaction to avoid any rollback of `ReturnStripePayments` table
 
     /** Splits total refund amount into order cc charges.
       *
@@ -377,7 +377,7 @@ object ReturnPaymentManager {
     for {
       previousCcRefunds ← * <~ Returns
                            .findPreviousOrCurrent(rma)
-                           .join(ReturnCcPayments)
+                           .join(ReturnStripePayments)
                            .on(_.id === _.returnId)
                            .map { case (_, ccPayment) ⇒ ccPayment.chargeId → ccPayment.amount }
                            .groupBy(_._1)

phoenix-scala/phoenix/app/phoenix/services/returns/ReturnPaymentManager.scala

@@ -7,8 +7,8 @@ import phoenix.models.location.Address
 import phoenix.models.payment.creditcard.CreditCard
 import phoenix.payloads.PaymentPayloads.CreateCreditCardFromSourcePayload
 import phoenix.utils.aliases.stripe._
-import utils.Money.Currency
-import utils.db._
+import core.utils.Money.Currency
+import core.db._
 
 /**
   * Fox Stripe API wrapper

phoenix-scala/phoenix/app/phoenix/utils/apis/FoxStripeApi.scala

@@ -1,5 +1,5 @@
 import cats.implicits._
-import failures.GeneralFailure
+import core.failures.GeneralFailure
 import phoenix.failures.OrderFailures.OnlyOneExternalPaymentIsAllowed
 import phoenix.models.location.Region
 import phoenix.models.shipping._