Conflicts resolution fixes

aafa · aafa · commit e59d5f1ad3e1 · 2017-05-24T23:46:31.000+02:00
diff --git a/phoenix-scala/app/utils/apis/ApplePay.md b/phoenix-scala/app/utils/apis/ApplePay.md
diff --git a/phoenix-scala/phoenix/app/phoenix/failures/CaptureFailures.scala b/phoenix-scala/phoenix/app/phoenix/failures/CaptureFailures.scala
@@ -2,7 +2,7 @@ package phoenix.failures
 
 import failures.Failure
 import phoenix.models.payment.creditcard._
-import models.payment.{ExternalCharge, ExternalChargeVals}
+import phoenix.models.payment.{ExternalCharge, ExternalChargeVals}
 
 object CaptureFailures {
 
diff --git a/phoenix-scala/phoenix/app/phoenix/models/cord/OrderPayment.scala b/phoenix-scala/phoenix/app/phoenix/models/cord/OrderPayment.scala
@@ -5,7 +5,7 @@ import failures.Failure
 import phoenix.models.cord.OrderPayments.filter
 import phoenix.models.payment.PaymentMethod
 import phoenix.models.payment.PaymentMethod.ExternalPayment
-import phoenix.models.payment.creditcard.{CreditCard, CreditCards}
+import phoenix.models.payment.creditcard.{CreditCard, CreditCardCharges, CreditCards}
 import phoenix.models.payment.applepay.{ApplePayCharge, ApplePayCharges, ApplePayment, ApplePayments}
 import phoenix.models.payment.giftcard.{GiftCard, GiftCards}
 import phoenix.models.payment.storecredit.{StoreCredit, StoreCredits}
@@ -51,6 +51,10 @@ case class OrderPayment(id: Int = 0,
   }
 }
 
+case class StripeOrderPayment(stripeChargeId: String,
+                              amount: Int,
+                              currency: Currency = Currency.USD)
+
 object OrderPayment {
   def fromStripeCustomer(stripeCustomer: StripeCustomer, cart: Cart): OrderPayment =
     OrderPayment(cordRef = cart.refNum,
diff --git a/phoenix-scala/phoenix/app/phoenix/models/payment/ExternalCharge.scala b/phoenix-scala/phoenix/app/phoenix/models/payment/ExternalCharge.scala
@@ -1,12 +1,12 @@
-package models.payment
+package phoenix.models.payment
 
 import com.pellucid.sealerate
 import failures.Failures
-import models.payment.ExternalCharge.State
+import phoenix.models.payment.ExternalCharge.State
 import slick.ast.BaseTypedType
 import slick.jdbc.JdbcType
 import utils.db.FoxModel
-import utils.{ADT, FSM}
+import phoenix.utils.{ADT, FSM}
 
 trait ExternalChargeVals {
   val stripeChargeId: String
diff --git a/phoenix-scala/phoenix/app/phoenix/models/payment/applepay/ApplePayCharge.scala b/phoenix-scala/phoenix/app/phoenix/models/payment/applepay/ApplePayCharge.scala
@@ -1,15 +1,15 @@
-package models.payment.applepay
+package phoenix.models.payment.applepay
 
 import java.time.Instant
 
-import models.cord.OrderPayment
-import models.payment.ExternalCharge
-import models.payment.ExternalCharge._
+import phoenix.models.cord.OrderPayment
+import phoenix.models.payment.ExternalCharge._
+import phoenix.models.payment.ExternalCharge
+import phoenix.utils.aliases.stripe.StripeCharge
 import shapeless.{Lens, lens}
 import slick.jdbc.PostgresProfile.api._
 import slick.lifted._
 import utils.Money.Currency
-import utils.aliases.stripe.StripeCharge
 import utils.db._
 
 case class ApplePayCharge(id: Int = 0,
diff --git a/phoenix-scala/phoenix/app/phoenix/models/payment/applepay/ApplePayment.scala b/phoenix-scala/phoenix/app/phoenix/models/payment/applepay/ApplePayment.scala
@@ -1,11 +1,11 @@
-package models.payment.applepay
+package phoenix.models.payment.applepay
 
 import java.time.Instant
 
 import cats.implicits._
 import cats.data.ValidatedNel
 import failures.Failure
-import models.payment.PaymentMethod
+import phoenix.models.payment.PaymentMethod
 import shapeless.{Lens, lens}
 import slick.jdbc.PostgresProfile.api._
 import utils.Validation
diff --git a/phoenix-scala/phoenix/app/phoenix/models/payment/creditcard/CreditCardCharge.scala b/phoenix-scala/phoenix/app/phoenix/models/payment/creditcard/CreditCardCharge.scala
@@ -3,8 +3,8 @@ package phoenix.models.payment.creditcard
 import java.time.Instant
 import failures.Failures
 import phoenix.models.cord.{OrderPayment, OrderPayments}
-import models.payment.ExternalCharge
-import models.payment.ExternalCharge._
+import phoenix.models.payment.ExternalCharge
+import phoenix.models.payment.ExternalCharge._
 import shapeless._
 import slick.jdbc.PostgresProfile.api._
 import utils.Money.Currency
diff --git a/phoenix-scala/phoenix/app/phoenix/models/returns/ReturnStripePayment.scala b/phoenix-scala/phoenix/app/phoenix/models/returns/ReturnStripePayment.scala
@@ -1,7 +1,7 @@
-package models.returns
+package phoenix.models.returns
 
-import models.payment.applepay.ApplePayCharges
-import models.payment.creditcard.CreditCardCharges
+import phoenix.models.payment.applepay.ApplePayCharges
+import phoenix.models.payment.creditcard.CreditCardCharges
 import shapeless._
 import slick.jdbc.PostgresProfile.api._
 import utils.Money.Currency
diff --git a/phoenix-scala/phoenix/app/phoenix/payloads/EntityExportPayloads.scala b/phoenix-scala/phoenix/app/phoenix/payloads/EntityExportPayloads.scala
@@ -4,14 +4,15 @@ import com.pellucid.sealerate
 import com.sksamuel.elastic4s.SortDefinition
 import java.nio.charset.StandardCharsets
 import java.time.Instant
+
 import org.elasticsearch.common.bytes.BytesArray
 import org.elasticsearch.common.xcontent.{ToXContent, XContentBuilder}
 import org.elasticsearch.search.sort.{SortBuilder, SortOrder}
 import org.json4s.{CustomSerializer, Formats}
 import org.json4s.JsonAST._
 import org.json4s.jackson.JsonMethods._
 import phoenix.models.cord.CordPaymentState
-import phoenix.models.payment.InStorePaymentStates
+import phoenix.models.payment.{ExternalCharge, InStorePaymentStates}
 import phoenix.models.payment.creditcard.CreditCardCharge
 import phoenix.services.CordQueries
 import phoenix.utils.{ADT, ADTTypeHints, JsonFormatters}
@@ -78,12 +79,13 @@ object EntityExportPayloads {
     object PaymentState extends FieldCalculation {
       def extraFields: List[String] = List("payments")
 
+      // todo add apple pay here ?  (this piece was merge in on rebase to master) @aafa
       lazy val calculate: PartialFunction[(String, JObject), String] = {
         def getState(jv: JValue): Option[CordPaymentState.State] =
           (jv \ "creditCardState")
             .extractOpt[String]
-            .flatMap(CreditCardCharge.State.read)
-            .map(CordPaymentState.fromCCState) orElse
+            .flatMap(ExternalCharge.State.read)
+            .map(CordPaymentState.fromExternalState) orElse
             (jv \ "giftCardState")
               .extractOpt[String]
               .flatMap(InStorePaymentStates.State.read)
diff --git a/phoenix-scala/phoenix/app/phoenix/services/CartValidator.scala b/phoenix-scala/phoenix/app/phoenix/services/CartValidator.scala
@@ -5,7 +5,7 @@ import failures.{Failure, Failures}
 import objectframework.services.ObjectManager
 import phoenix.failures.CartFailures._
 import phoenix.models.cord._
-import models.payment.applepay.ApplePayCharges
+import phoenix.models.payment.applepay.ApplePayCharges
 import phoenix.models.cord.lineitems.CartLineItems
 import phoenix.models.inventory.{IlluminatedSku, Skus}
 import phoenix.models.payment.giftcard.{GiftCardAdjustments, GiftCards}
diff --git a/phoenix-scala/phoenix/app/phoenix/services/Checkout.scala b/phoenix-scala/phoenix/app/phoenix/services/Checkout.scala
@@ -9,26 +9,28 @@ import objectframework.ObjectUtils
 import objectframework.models._
 import org.json4s.JsonAST._
 import phoenix.failures.AddressFailures.NoDefaultAddressForCustomer
+import phoenix.failures.CartFailures.NoCartFound
 import phoenix.failures.CouponFailures.CouponWithCodeCannotBeFound
 import phoenix.failures.CreditCardFailures.NoDefaultCreditCardForCustomer
+import phoenix.failures.OrderFailures.OnlyOneExternalPaymentIsAllowed
 import phoenix.failures.PromotionFailures.PromotionNotFoundForContext
-import phoenix.failures.ShippingMethodFailures.NoDefaultShippingMethod
 import phoenix.models.account._
 import phoenix.models.cord._
 import phoenix.models.cord.lineitems.CartLineItems
 import phoenix.models.cord.lineitems.CartLineItems.scope._
 import phoenix.models.coupon._
 import phoenix.models.inventory.Skus
 import phoenix.models.location.Addresses
+import phoenix.models.payment.applepay.{ApplePayCharge, ApplePayCharges}
 import phoenix.models.payment.creditcard._
 import phoenix.models.payment.giftcard._
 import phoenix.models.payment.storecredit._
 import phoenix.models.promotion._
 import phoenix.models.shipping.DefaultShippingMethods
 import phoenix.payloads.CartPayloads.CheckoutCart
 import phoenix.payloads.LineItemPayloads.UpdateLineItemsPayload
+import phoenix.payloads.PaymentPayloads.CreateApplePayPayment
 import phoenix.responses.cord.OrderResponse
-
 import phoenix.services.carts._
 import phoenix.services.coupon.CouponUsageService
 import phoenix.services.inventory.SkuManager
diff --git a/phoenix-scala/phoenix/app/phoenix/services/CordQueries.scala b/phoenix-scala/phoenix/app/phoenix/services/CordQueries.scala
@@ -7,7 +7,7 @@ import phoenix.models.payment.creditcard.CreditCardCharges
 import phoenix.models.payment.giftcard.GiftCardAdjustments
 import phoenix.models.payment.storecredit.StoreCreditAdjustments
 import phoenix.utils.aliases.EC
-import models.payment.applepay.ApplePayCharges
+import phoenix.models.payment.applepay.ApplePayCharges
 import slick.dbio.DBIO
 import utils.db.ExPostgresDriver.api._
 import utils.db._
diff --git a/phoenix-scala/phoenix/app/phoenix/services/carts/CartPaymentUpdater.scala b/phoenix-scala/phoenix/app/phoenix/services/carts/CartPaymentUpdater.scala
@@ -20,11 +20,10 @@ import phoenix.responses.cord.CartResponse
 import phoenix.services.{CartValidator, LogActivity}
 import slick.jdbc.PostgresProfile.api._
 import phoenix.utils.aliases._
-import utils.apis.Apis
+import phoenix.utils.apis.Apis
 import utils.db._
-import failures.ApplePayFailures._
-import models.payment.PaymentMethod.ApplePay
-import models.payment.applepay._
+import phoenix.models.payment.PaymentMethod.ApplePay
+import phoenix.models.payment.applepay._
 
 object CartPaymentUpdater {
 
diff --git a/phoenix-scala/phoenix/app/phoenix/utils/apis/FoxStripe.scala b/phoenix-scala/phoenix/app/phoenix/utils/apis/FoxStripe.scala
@@ -1,6 +1,5 @@
 package phoenix.utils.apis
 
-
 import cats.implicits._
 import com.stripe.model.{DeletedCard, Token}
 import phoenix.failures.CustomerFailures.CustomerMustHaveCredentials
diff --git a/phoenix-scala/phoenix/app/phoenix/utils/apis/FoxStripeApi.scala b/phoenix-scala/phoenix/app/phoenix/utils/apis/FoxStripeApi.scala
@@ -5,6 +5,7 @@ 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._
 
 /**
diff --git a/phoenix-scala/phoenix/app/phoenix/utils/json.scala b/phoenix-scala/phoenix/app/phoenix/utils/json.scala
@@ -14,7 +14,7 @@ import phoenix.models.inventory.SkuType
 import phoenix.models.payment.creditcard.CreditCardCharge
 import phoenix.models.payment.giftcard.GiftCard
 import phoenix.models.payment.storecredit.StoreCredit
-import phoenix.models.payment.{InStorePaymentStates, PaymentMethod}
+import phoenix.models.payment.{ExternalCharge, InStorePaymentStates, PaymentMethod}
 import phoenix.models.plugins.PluginSettings
 import phoenix.models.promotion.Promotion
 import phoenix.models.returns._
diff --git a/phoenix-scala/phoenix/test/integration/ApplePayIntegrationTest.scala b/phoenix-scala/phoenix/test/integration/ApplePayIntegrationTest.scala
@@ -1,24 +1,26 @@
 import cats.implicits._
 import failures.GeneralFailure
-import failures.OrderFailures.OnlyOneExternalPaymentIsAllowed
+import phoenix.failures.OrderFailures.OnlyOneExternalPaymentIsAllowed
+import phoenix.models.location.Region
+import phoenix.models.shipping._
+import phoenix.payloads.AddressPayloads.CreateAddressPayload
+import phoenix.payloads.CapturePayloads.{Capture, CaptureLineItem, ShippingCost}
+import phoenix.payloads.CartPayloads.CreateCart
+import phoenix.payloads.CustomerPayloads.CreateCustomerPayload
+import phoenix.payloads.LineItemPayloads._
+import phoenix.payloads.PaymentPayloads.{CreateApplePayPayment, CreditCardPayment}
+import phoenix.payloads.UpdateShippingMethod
+import phoenix.responses.cord._
+import phoenix.responses.{CaptureResponse, CreditCardsResponse, CustomerResponse}
+import testutils.apis._
+import utils.MockedApis
+import phoenix.utils.seeds.{Factories, ShipmentSeeds}
+import testutils.{DefaultJwtAdminAuth, IntegrationTestBase, TestLoginData}
+import testutils.fixtures.api.{ApiFixtureHelpers, ApiFixtures}
 import faker.Lorem
-import models.location.Region
-import models.shipping._
-import payloads.AddressPayloads.CreateAddressPayload
-import payloads.CapturePayloads.{Capture, CaptureLineItem, ShippingCost}
-import payloads.CartPayloads.CreateCart
-import payloads.CustomerPayloads.CreateCustomerPayload
-import payloads.LineItemPayloads._
-import payloads.PaymentPayloads.{CreateApplePayPayment, CreditCardPayment}
-import payloads.UpdateShippingMethod
-import responses.cord._
-import responses.{CaptureResponse, CreditCardsResponse, CustomerResponse}
 import testutils._
-import testutils.apis.PhoenixStorefrontApi
 import testutils.fixtures.PaymentFixtures.CreditCardsFixture
 import testutils.fixtures.api._
-import utils.MockedApis
-import utils.seeds.{Factories, ShipmentSeeds}
 
 class ApplePayIntegrationTest
     extends IntegrationTestBase
diff --git a/phoenix-scala/phoenix/test/integration/CartIntegrationTest.scala b/phoenix-scala/phoenix/test/integration/CartIntegrationTest.scala
@@ -7,6 +7,7 @@ import phoenix.failures.ShippingMethodFailures._
 import phoenix.models.cord.{CordPaymentState, _}
 import phoenix.models.cord.lineitems._
 import phoenix.models.location._
+import phoenix.models.payment.ExternalCharge
 import phoenix.models.payment.creditcard._
 import phoenix.models.product.Mvp
 import phoenix.models.rules.QueryStatement
diff --git a/phoenix-scala/phoenix/test/integration/CustomerIntegrationTest.scala b/phoenix-scala/phoenix/test/integration/CustomerIntegrationTest.scala
@@ -14,6 +14,7 @@ import phoenix.models.cord.OrderPayments.scope._
 import phoenix.models.cord._
 import phoenix.models.customer._
 import phoenix.models.location.{Addresses, Regions}
+import phoenix.models.payment.ExternalCharge
 import phoenix.models.payment.creditcard._
 import phoenix.models.shipping.Shipment.Shipped
 import phoenix.models.shipping.{Shipment, Shipments}
diff --git a/phoenix-scala/phoenix/test/integration/testutils/apis/PhoenixStorefrontApi.scala b/phoenix-scala/phoenix/test/integration/testutils/apis/PhoenixStorefrontApi.scala
@@ -4,7 +4,7 @@ import akka.http.scaladsl.model.HttpResponse
 import cats.implicits._
 import phoenix.payloads.CartPayloads.CheckoutCart
 import phoenix.payloads.LineItemPayloads.UpdateLineItemsPayload
-import phoenix.payloads.PaymentPayloads.CreateCreditCardFromTokenPayload
+import phoenix.payloads.PaymentPayloads.{CreateApplePayPayment, CreateCreditCardFromTokenPayload}
 import testutils._
 
 trait PhoenixStorefrontApi extends HttpSupport { self: FoxSuite ⇒
@@ -27,6 +27,10 @@ trait PhoenixStorefrontApi extends HttpSupport { self: FoxSuite ⇒
     def checkout(payload: CheckoutCart)(implicit ca: TestCustomerAuth): HttpResponse =
       POST(s"$cartPath/checkout", payload, ca.jwtCookie.some)
 
+    def applePayCheckout(payload: CreateApplePayPayment)(
+        implicit ca: TestCustomerAuth): HttpResponse =
+      POST(s"$cartPath/apple-pay-checkout", payload, ca.jwtCookie.some)
+
     object lineItems {
       val lineItemsPath = s"$cartPath/line-items"
 
@@ -60,6 +64,15 @@ trait PhoenixStorefrontApi extends HttpSupport { self: FoxSuite ⇒
   object storefrontPaymentsApi {
     val paymentPath = s"$rootPrefix/payment-methods"
 
+    object applePay {
+      val path = s"$paymentPath/apple-pay"
+
+      def create(p: CreateApplePayPayment)(implicit ca: TestCustomerAuth): HttpResponse =
+        POST(path, p, ca.jwtCookie.some)
+      def get()(implicit ca: TestCustomerAuth): HttpResponse    = GET(path, ca.jwtCookie.some)
+      def delete()(implicit ca: TestCustomerAuth): HttpResponse = DELETE(path, ca.jwtCookie.some)
+    }
+
     object creditCards {
       val ccPath = s"$paymentPath/credit-cards"
 
diff --git a/phoenix-scala/phoenix/test/integration/testutils/fixtures/PaymentFixtures.scala b/phoenix-scala/phoenix/test/integration/testutils/fixtures/PaymentFixtures.scala
@@ -3,10 +3,10 @@ package testutils.fixtures
 import java.time.ZonedDateTime
 
 import cats.implicits._
-import payloads.AddressPayloads.CreateAddressPayload
-import payloads.PaymentPayloads.CreateCreditCardFromTokenPayload
-import utils.TestStripeSupport
-import utils.seeds.Factories
+import phoenix.payloads.AddressPayloads.CreateAddressPayload
+import phoenix.payloads.PaymentPayloads.CreateCreditCardFromTokenPayload
+import phoenix.utils.TestStripeSupport
+import phoenix.utils.seeds.Factories
 
 object PaymentFixtures {
 
diff --git a/phoenix-scala/phoenix/test/integration/testutils/fixtures/api/ApiFixtureHelpers.scala b/phoenix-scala/phoenix/test/integration/testutils/fixtures/api/ApiFixtureHelpers.scala
@@ -12,7 +12,6 @@ import phoenix.responses.{CreditCardsResponse, CustomerResponse, GiftCardRespons
 import phoenix.utils.aliases._
 import testutils._
 import testutils.apis.PhoenixAdminApi
-import utils.aliases._
 
 trait ApiFixtureHelpers extends PhoenixAdminApi with ApiFixtures { self: FoxSuite ⇒
   def api_newCustomer()(implicit sl: SL, sf: SF): CustomerResponse.Root = {
diff --git a/phoenix-scala/phoenix/test/unit/utils/JsonFormattersTest.scala b/phoenix-scala/phoenix/test/unit/utils/JsonFormattersTest.scala
@@ -7,6 +7,7 @@ import org.json4s.jackson.JsonMethods.parse
 import org.json4s.jackson.Serialization.write
 import phoenix.models.admin.AdminData
 import phoenix.models.cord.Order
+import phoenix.models.payment.ExternalCharge
 import phoenix.models.payment.creditcard.CreditCardCharge
 import phoenix.models.payment.giftcard.GiftCard
 import phoenix.utils.JsonFormatters._
diff --git a/phoenix-scala/test/integration/CheckoutIntegrationTest.scala b/phoenix-scala/test/integration/CheckoutIntegrationTest.scala
diff --git a/phoenix-scala/test/integration/testutils/apis/PhoenixStorefrontApi.scala b/phoenix-scala/test/integration/testutils/apis/PhoenixStorefrontApi.scala
diff --git a/phoenix-scala/test/unit/payloads/EntityExportPayloadsTest.scala b/phoenix-scala/test/unit/payloads/EntityExportPayloadsTest.scala
diff --git a/phoenix-scala/test/unit/services/EntityExporterTest.scala b/phoenix-scala/test/unit/services/EntityExporterTest.scala
diff --git a/phoenix-scala/test/unit/utils/StringsTest.scala b/phoenix-scala/test/unit/utils/StringsTest.scala
