Merge pull request #416 from ostelco/feature/recurring-payment-purcha…

…se-and-time-remaining Feature/recurring payment purchase and time remaining (WIP)
ostelco · Dec 19, 2018 · e65a0b7 · e65a0b7
2 parents e0f3823 + 7714924
commit e65a0b7
Show file tree

Hide file tree

Showing 17 changed files with 432 additions and 248 deletions.
diff --git a/acceptance-tests/script/wait.sh b/acceptance-tests/script/wait.sh
@@ -32,6 +32,7 @@ java -cp '/acceptance-tests.jar' org.junit.runner.JUnitCore \
      org.ostelco.at.jersey.BundlesAndPurchasesTest \
      org.ostelco.at.jersey.SourceTest \
      org.ostelco.at.jersey.PurchaseTest \
+     org.ostelco.at.jersey.PlanTest \
      org.ostelco.at.jersey.AnalyticsTest \
      org.ostelco.at.jersey.ConsentTest \
      org.ostelco.at.jersey.ProfileTest \

diff --git a/acceptance-tests/src/main/kotlin/org/ostelco/at/jersey/Tests.kt b/acceptance-tests/src/main/kotlin/org/ostelco/at/jersey/Tests.kt
@@ -1191,10 +1191,12 @@ class PlanTest {
                 .amount(100)
                 .currency("nok")
         val plan = Plan()
-                .name("test")
+                .name("PLAN_1_NOK_PER_DAY")
                 .price(price)
                 .interval(Plan.IntervalEnum.DAY)
                 .intervalCount(1)
+                .properties(emptyMap<String, Any>())
+                .presentation(emptyMap<String, Any>())
 
         post<Plan> {
             path = "/plans"
@@ -1239,6 +1241,8 @@ class PlanTest {
                 .price(price)
                 .interval(Plan.IntervalEnum.DAY)
                 .intervalCount(1)
+                .properties(emptyMap<String, Any>())
+                .presentation(emptyMap<String, Any>())
 
         try {
             // Create subscriber with payment source.

diff --git a/admin-api/src/main/kotlin/org/ostelco/prime/admin/api/HoustonResources.kt b/admin-api/src/main/kotlin/org/ostelco/prime/admin/api/HoustonResources.kt
@@ -196,9 +196,14 @@ class ProfilesResource {
     @Produces("application/json")
     fun getPlans(@PathParam("email") email: String): Response {
         return storage.getPlans(email).fold(
-                { apiError ->  Response.status(apiError.status).entity(asJson(apiError)) },
-                { Response.status(Response.Status.OK).entity(asJson(it)) })
-                .build()
+                {
+                    val err = ApiErrorMapper.mapStorageErrorToApiError("Failed to fetch plans",
+                            ApiErrorCode.FAILED_TO_FETCH_PLANS_FOR_SUBSCRIBER,
+                            it)
+                    Response.status(err.status).entity(asJson(err))
+                },
+                { Response.status(Response.Status.OK).entity(asJson(it)) }
+        ).build()
     }
 
     /**
@@ -210,10 +215,15 @@ class ProfilesResource {
     fun attachPlan(@PathParam("email") email: String,
                    @PathParam("planId") planId: String,
                    @QueryParam("trial_end") trialEnd: Long): Response {
-        return storage.attachPlan(email, planId, trialEnd).fold(
-                { apiError -> Response.status(apiError.status).entity(asJson(apiError)) },
-                { Response.status(Response.Status.CREATED) })
-                .build()
+        return storage.subscribeToPlan(email, planId, trialEnd).fold(
+                {
+                    val err = ApiErrorMapper.mapStorageErrorToApiError("Failed to store subscription",
+                            ApiErrorCode.FAILED_TO_STORE_SUBSCRIPTION,
+                            it)
+                    Response.status(err.status).entity(asJson(err))
+                },
+                { Response.status(Response.Status.CREATED) }
+        ).build()
     }
 
     /**
@@ -224,10 +234,15 @@ class ProfilesResource {
     @Produces("application/json")
     fun detachPlan(@PathParam("email") email: String,
                    @PathParam("planId") planId: String): Response {
-        return storage.detachPlan(email, planId).fold(
-                { apiError -> Response.status(apiError.status).entity(asJson(apiError)) },
-                { Response.status(Response.Status.OK) })
-                .build()
+        return storage.unsubscribeFromPlan(email, planId).fold(
+                {
+                    val err = ApiErrorMapper.mapStorageErrorToApiError("Failed to remove subscription",
+                            ApiErrorCode.FAILED_TO_REMOVE_SUBSCRIPTION,
+                            it)
+                    Response.status(err.status).entity(asJson(err))
+                },
+                { Response.status(Response.Status.OK) }
+        ).build()
     }
 }
 
@@ -430,6 +445,7 @@ class NotifyResource {
 @Path("/plans")
 class PlanResource() {
 
+    private val logger by getLogger()
     private val storage by lazy { getResource<AdminDataSource>() }
 
     /**
@@ -441,9 +457,14 @@ class PlanResource() {
     fun get(@NotNull
             @PathParam("planId") planId: String): Response {
         return storage.getPlan(planId).fold(
-                { apiError -> Response.status(apiError.status).entity(asJson(apiError)) },
-                { Response.status(Response.Status.OK).entity(asJson(it)) })
-                .build()
+                {
+                    val err = ApiErrorMapper.mapStorageErrorToApiError("Failed to fetch plan",
+                            ApiErrorCode.FAILED_TO_FETCH_PLAN,
+                            it)
+                    Response.status(err.status).entity(asJson(err))
+                },
+                { Response.status(Response.Status.OK).entity(asJson(it)) }
+        ).build()
     }
 
     /**
@@ -452,11 +473,16 @@ class PlanResource() {
     @POST
     @Produces("application/json")
     @Consumes("application/json")
-    fun create(plan: Plan) : Response {
+    fun create(plan: Plan): Response {
         return storage.createPlan(plan).fold(
-                { apiError -> Response.status(apiError.status).entity(asJson(apiError))},
-                { Response.status(Response.Status.CREATED).entity(asJson(it))})
-                .build()
+                {
+                    val err = ApiErrorMapper.mapStorageErrorToApiError("Failed to store plan",
+                            ApiErrorCode.FAILED_TO_STORE_PLAN,
+                            it)
+                    Response.status(err.status).entity(asJson(err))
+                },
+                { Response.status(Response.Status.CREATED).entity(asJson(it)) }
+        ).build()
     }
 
     /**
@@ -469,8 +495,13 @@ class PlanResource() {
     fun delete(@NotNull
                @PathParam("planId") planId: String) : Response {
         return storage.deletePlan(planId).fold(
-                { apiError -> Response.status(apiError.status).entity(asJson(apiError)) },
-                { Response.status(Response.Status.OK).entity(asJson(it))})
-                .build()
+                {
+                    val err = ApiErrorMapper.mapStorageErrorToApiError("Failed to remove plan",
+                            ApiErrorCode.FAILED_TO_REMOVE_PLAN,
+                            it)
+                    Response.status(err.status).entity(asJson(err))
+                },
+                { Response.status(Response.Status.OK).entity(asJson(it))}
+        ).build()
     }
 }
diff --git a/model/src/main/kotlin/org/ostelco/prime/model/Entities.kt b/model/src/main/kotlin/org/ostelco/prime/model/Entities.kt
@@ -137,8 +137,8 @@ data class Plan(
         val price: Price,
         val interval: String,
         val intervalCount: Long = 1L,
-        val planId: String = "",
-        val productId: String = "") : HasId {
+        val properties: Map<String, String> = emptyMap(),
+        val presentation: Map<String, String> = emptyMap()) : HasId {
 
     override val id: String
         @JsonIgnore