Capture campaign referrer at signup and remove from assistance details

model.
hmrc · Jan 3, 2017 · 5fefe38 · 5fefe38
1 parent e3b83ed
commit 5fefe38
Show file tree

Hide file tree

Showing 85 changed files with 152 additions and 159 deletions.
diff --git a/app/binders/UniqueIdentifierBinder.scala b/app/binders/UniqueIdentifierBinder.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/config/frontendAppConfig.scala b/app/config/frontendAppConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/config/frontendGlobal.scala b/app/config/frontendGlobal.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/config/frontendWiring.scala b/app/config/frontendWiring.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/connectors/AllocationExchangeObjects.scala b/app/connectors/AllocationExchangeObjects.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/connectors/ApplicationClient.scala b/app/connectors/ApplicationClient.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,55 +42,56 @@ trait ApplicationClient {
   import ExchangeObjects.Implicits._
   import config.FrontendAppConfig.fasttrackConfig._
 
-  def createApplication(userId: UniqueIdentifier, frameworkId: String)(implicit hc: HeaderCarrier) = {
+  def createApplication(userId: UniqueIdentifier, frameworkId: String)
+    (implicit hc: HeaderCarrier): Future[ApplicationResponse] = {
 
     http.PUT(s"${url.host}${url.base}/application/create", CreateApplicationRequest(userId, frameworkId)).map { response =>
       response.json.as[ApplicationResponse]
     }
   }
 
-  def submitApplication(userId: UniqueIdentifier, applicationId: UniqueIdentifier)(implicit hc: HeaderCarrier) = {
+  def submitApplication(userId: UniqueIdentifier, applicationId: UniqueIdentifier)
+    (implicit hc: HeaderCarrier): Future[Unit] = {
     http.PUT(s"${url.host}${url.base}/application/submit/$userId/$applicationId", Json.toJson("")).map {
       case x: HttpResponse if x.status == OK => ()
     }.recover {
       case _: BadRequestException => throw new CannotSubmit()
     }
   }
 
-  def withdrawApplication(applicationId: UniqueIdentifier, reason: WithdrawApplicationRequest)(implicit hc: HeaderCarrier) = {
+  def withdrawApplication(applicationId: UniqueIdentifier, reason: WithdrawApplicationRequest)
+    (implicit hc: HeaderCarrier): Future[Unit] = {
     http.PUT(s"${url.host}${url.base}/application/withdraw/$applicationId", Json.toJson(reason)).map {
       case x: HttpResponse if x.status == OK => ()
     }.recover {
       case _: NotFoundException => throw new CannotWithdraw()
     }
   }
 
-  def addMedia(userId: UniqueIdentifier, media: String)(implicit hc: HeaderCarrier) = {
+  def addMedia(userId: UniqueIdentifier, media: String)(implicit hc: HeaderCarrier): Future[Unit] = {
     http.PUT(s"${url.host}${url.base}/media/create", AddMedia(userId, media)).map {
       case x: HttpResponse if x.status == CREATED => ()
     } recover {
       case _: BadRequestException => throw new CannotAddMedia()
     }
   }
 
-  def getApplicationProgress(applicationId: UniqueIdentifier)(implicit hc: HeaderCarrier) = {
+  def getApplicationProgress(applicationId: UniqueIdentifier)(implicit hc: HeaderCarrier): Future[ProgressResponse] = {
     http.GET(s"${url.host}${url.base}/application/progress/$applicationId").map { response =>
       response.json.as[ProgressResponse]
     }
   }
 
-  def findApplication(userId: UniqueIdentifier, frameworkId: String)(implicit hc: HeaderCarrier) = {
+  def findApplication(userId: UniqueIdentifier, frameworkId: String)(implicit hc: HeaderCarrier): Future[ApplicationResponse] = {
     http.GET(s"${url.host}${url.base}/application/find/user/$userId/framework/$frameworkId").map { response =>
       response.json.as[ApplicationResponse]
     } recover {
       case _: NotFoundException => throw new ApplicationNotFound()
     }
   }
 
-  def updateGeneralDetails(applicationId: UniqueIdentifier, userId: UniqueIdentifier, data: GeneralDetailsForm.Data, email: String)(
-    implicit
-    hc: HeaderCarrier
-  ) = {
+  def updateGeneralDetails(applicationId: UniqueIdentifier, userId: UniqueIdentifier, data: GeneralDetailsForm.Data,
+    email: String)(implicit hc: HeaderCarrier): Future[Unit] = {
 
     http.POST(
       s"${url.host}${url.base}/personal-details/$userId/$applicationId",
@@ -113,18 +114,17 @@ trait ApplicationClient {
       }
   }
 
-  def findPersonalDetails(userId: UniqueIdentifier, applicationId: UniqueIdentifier)(implicit hc: HeaderCarrier) = {
+  def findPersonalDetails(userId: UniqueIdentifier, applicationId: UniqueIdentifier)
+    (implicit hc: HeaderCarrier): Future[GeneralDetailsExchange] = {
     http.GET(s"${url.host}${url.base}/personal-details/$userId/$applicationId").map { response =>
       response.json.as[GeneralDetailsExchange]
     } recover {
       case e: NotFoundException => throw new PersonalDetailsNotFound()
     }
   }
 
-  def updateAssistanceDetails(applicationId: UniqueIdentifier, userId: UniqueIdentifier, data: AssistanceForm.Data)(
-    implicit
-    hc: HeaderCarrier
-  ) = {
+  def updateAssistanceDetails(applicationId: UniqueIdentifier, userId: UniqueIdentifier, data: AssistanceForm.Data)
+    (implicit hc: HeaderCarrier): Future[Unit] = {
     http.PUT(
       s"${url.host}${url.base}/assistance-details/$userId/$applicationId",
       data.exchange
@@ -135,18 +135,17 @@ trait ApplicationClient {
       }
   }
 
-  def findAssistanceDetails(userId: UniqueIdentifier, applicationId: UniqueIdentifier)(implicit hc: HeaderCarrier) = {
+  def findAssistanceDetails(userId: UniqueIdentifier, applicationId: UniqueIdentifier)
+    (implicit hc: HeaderCarrier): Future[AssistanceDetailsExchange] = {
     http.GET(s"${url.host}${url.base}/assistance-details/$userId/$applicationId").map { response =>
       response.json.as[AssistanceDetailsExchange]
     } recover {
       case _: NotFoundException => throw new AssistanceDetailsNotFound()
     }
   }
 
-  def updateQuestionnaire(applicationId: UniqueIdentifier, sectionId: String, questionnaire: Questionnaire)(
-    implicit
-    hc: HeaderCarrier
-  ) = {
+  def updateQuestionnaire(applicationId: UniqueIdentifier, sectionId: String, questionnaire: Questionnaire)
+    (implicit hc: HeaderCarrier): Future[Unit] = {
     http.PUT(
       s"${url.host}${url.base}/questionnaire/$applicationId/$sectionId",
       questionnaire
@@ -157,7 +156,7 @@ trait ApplicationClient {
       }
   }
 
-  def updateReview(applicationId: UniqueIdentifier)(implicit hc: HeaderCarrier) = {
+  def updateReview(applicationId: UniqueIdentifier)(implicit hc: HeaderCarrier): Future[Unit] = {
     http.PUT(
       s"${url.host}${url.base}/application/review/$applicationId",
       ReviewRequest(true)

diff --git a/app/connectors/ExchangeObjects.scala b/app/connectors/ExchangeObjects.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,9 +63,7 @@ object ExchangeObjects {
     guaranteedInterview: Option[String],
     needsAdjustment: Option[String],
     typeOfAdjustments: Option[List[String]],
-    otherAdjustments: Option[String],
-    campaignReferrer: Option[String],
-    campaignOther: Option[String]
+    otherAdjustments: Option[String]
   )
 
   case class AddMedia(userId: UniqueIdentifier, media: String)
@@ -219,9 +217,7 @@ object ExchangeObjects {
         if (needsAssistance) { None } else data.guaranteedInterview,
         Some(data.needsAdjustment),
         if (data.needsAdjustment == "No") { None } else data.typeOfAdjustments,
-        adjustmentValid(data, data.otherAdjustments),
-        data.campaignReferrer,
-        data.campaignOther
+        adjustmentValid(data, data.otherAdjustments)
       )
     }
 

diff --git a/app/connectors/SchemeClient.scala b/app/connectors/SchemeClient.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/connectors/UserManagementClient.scala b/app/connectors/UserManagementClient.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/connectors/addresslookup/AddressLookupClient.scala b/app/connectors/addresslookup/AddressLookupClient.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/connectors/addresslookup/AddressRecord.scala b/app/connectors/addresslookup/AddressRecord.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/connectors/exchange/ProgressResponse.scala b/app/connectors/exchange/ProgressResponse.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/connectors/package.scala b/app/connectors/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/ActivationController.scala b/app/controllers/ActivationController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/AssistanceController.scala b/app/controllers/AssistanceController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,9 +42,7 @@ trait AssistanceController extends BaseController with ApplicationClient {
           ad.guaranteedInterview,
           ad.needsAdjustment.getOrElse(""),
           ad.typeOfAdjustments,
-          ad.otherAdjustments,
-          ad.campaignReferrer,
-          ad.campaignOther
+          ad.otherAdjustments
         ))
         Ok(views.html.application.assistance(form))
       }.recover {
@@ -59,24 +57,16 @@ trait AssistanceController extends BaseController with ApplicationClient {
         invalidForm =>
           Future.successful(Ok(views.html.application.assistance(invalidForm))),
         data => {
-          addMedia(user.user.userID, extractMediaReferrer(data)).flatMap { _ =>
-            updateAssistanceDetails(user.application.applicationId, user.user.userID, data).flatMap { _ =>
-              updateProgress()(_ => Redirect(routes.ReviewApplicationController.present()))
-            }.recover {
-              case e: AssistanceDetailsNotFound =>
-                Redirect(routes.HomeController.present()).flashing(danger("account.error"))
-            }
+          updateAssistanceDetails(user.application.applicationId, user.user.userID, data).flatMap { _ =>
+            updateProgress()(_ => Redirect(routes.ReviewApplicationController.present()))
+          }.recover {
+            case e: AssistanceDetailsNotFound =>
+              Redirect(routes.HomeController.present()).flashing(danger("account.error"))
           }
         }
       )
   }
 
-  private def extractMediaReferrer(data: AssistanceForm.Data): String = {
-    if (data.campaignReferrer.contains("Other") || data.campaignReferrer.contains("Careers fair")) {
-      data.campaignOther.getOrElse("")
-    } else {
-      data.campaignReferrer.getOrElse("")
-    }
-  }
+
 
 }
diff --git a/app/controllers/BaseController.scala b/app/controllers/BaseController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/FastTrackApplication.scala b/app/controllers/FastTrackApplication.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/HomeController.scala b/app/controllers/HomeController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/LandingPageController.scala b/app/controllers/LandingPageController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/LockAccountController.scala b/app/controllers/LockAccountController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/OnlineTestController.scala b/app/controllers/OnlineTestController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/PasswordResetController.scala b/app/controllers/PasswordResetController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/QuestionnaireController.scala b/app/controllers/QuestionnaireController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/ReviewApplicationController.scala b/app/controllers/ReviewApplicationController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/SchemeController.scala b/app/controllers/SchemeController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/controllers/SignInController.scala b/app/controllers/SignInController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.