Merge pull request #17 from jose-puente-digital-hmrc-gov-uk/obsolete-…

…code-deletion-and-json-schema-refactoring

Delete obsolete code and refactor json schemas

app/uk/gov/hmrc/epayeapi/connectors/ConnectorBase.scala

@@ -19,7 +19,8 @@ package uk.gov.hmrc.epayeapi.connectors
 import play.api.Logger
 import play.api.http.Status
 import play.api.libs.json.{JsError, JsSuccess, Reads}
-import uk.gov.hmrc.epayeapi.models.api._
+import uk.gov.hmrc.epayeapi.models.in
+import uk.gov.hmrc.epayeapi.models.in._
 import uk.gov.hmrc.epayeapi.syntax.json._
 import uk.gov.hmrc.play.http.{HeaderCarrier, HttpGet, HttpReads, HttpResponse}
 
@@ -55,7 +56,7 @@ trait ConnectorBase {
           case Status.NOT_FOUND =>
             ApiNotFound()
           case _ =>
-            ApiError(response.status, response.body)
+            in.ApiError(response.status, response.body)
         }
       }
     }

app/uk/gov/hmrc/epayeapi/connectors/EpayeConnector.scala

@@ -20,16 +20,14 @@ import javax.inject.{Inject, Singleton}
 
 import uk.gov.hmrc.domain.EmpRef
 import uk.gov.hmrc.epayeapi.models.Formats._
-import uk.gov.hmrc.epayeapi.models._
-import uk.gov.hmrc.epayeapi.models.api.ApiResponse
+import uk.gov.hmrc.epayeapi.models.in.{AnnualSummaryResponse, ApiResponse, EpayeTotalsResponse, TaxYear}
 import uk.gov.hmrc.play.http.HeaderCarrier
 import uk.gov.hmrc.play.http.ws.WSHttp
 
 import scala.concurrent.{ExecutionContext, Future}
 
 case class EpayeApiConfig(baseUrl: String)
 
-
 @Singleton
 case class EpayeConnector @Inject() (
   config: EpayeApiConfig,
@@ -47,16 +45,6 @@ case class EpayeConnector @Inject() (
     get[EpayeTotalsResponse](url, headers)
   }
 
-  def getTotalsByType(empRef: EmpRef, headers: HeaderCarrier): Future[ApiResponse[AggregatedTotalsByType]] = {
-    val url =
-      s"${config.baseUrl}" +
-        s"/epaye" +
-        s"/${empRef.encodedValue}" +
-        s"/api/v1/totals/by-type"
-
-    get[AggregatedTotalsByType](url, headers)
-  }
-
   def getAnnualSummary(empRef: EmpRef, headers: HeaderCarrier, taxYear: Option[String]): Future[ApiResponse[AnnualSummaryResponse]] = {
     val url =
       s"${config.baseUrl}" +

app/uk/gov/hmrc/epayeapi/controllers/ApiController.scala

@@ -20,15 +20,14 @@ import akka.stream.Materializer
 import play.api.libs.json.Json
 import play.api.libs.streams.Accumulator
 import play.api.mvc._
-import uk.gov.hmrc.auth.core._
-import uk.gov.hmrc.domain.EmpRef
-import uk.gov.hmrc.play.microservice.controller.BaseController
 import uk.gov.hmrc.auth.core.Retrievals._
+import uk.gov.hmrc.auth.core._
 import uk.gov.hmrc.domain.EmpRef
-import uk.gov.hmrc.epayeapi.models.ApiError.InvalidEmpRef
-import uk.gov.hmrc.epayeapi.models.Formats._
-import uk.gov.hmrc.epayeapi.models.{ApiError, EmpRefsResponse}
+import uk.gov.hmrc.epayeapi.models.out.ApiError.{AuthorizationHeaderInvalid, InsufficientEnrolments, InvalidEmpRef}
 import uk.gov.hmrc.play.binders.SimpleObjectBinder
+import uk.gov.hmrc.play.microservice.controller.BaseController
+import uk.gov.hmrc.epayeapi.models.out.Formats._
+
 
 import scala.concurrent.{ExecutionContext, Future}
 
@@ -44,16 +43,15 @@ trait ApiController extends BaseController with AuthorisedFunctions {
       Accumulator.done {
         authorised(enrolment.withDelegatedAuthRule("epaye-auth"))
           .retrieve(retrieveEnrolments) { enrolments =>
-          action(enrolments)(request).run()
-        } recoverWith {
-          case ex: MissingBearerToken => missingBearerToken
-          case ex: InsufficientEnrolments => insufficientEnrolments
-        }
+            action(enrolments)(request).run()
+          } recoverWith {
+            case ex: MissingBearerToken => missingBearerToken
+            case ex: InsufficientEnrolments => insufficientEnrolments
+          }
       }
     }
   }
 
-
   def EmpRefsAction(action: Set[EmpRef] => EssentialAction): EssentialAction =
     EnrolmentsAction(epayeEnrolment, epayeRetrieval) { enrolments =>
       EssentialAction { request =>
@@ -73,11 +71,11 @@ trait ApiController extends BaseController with AuthorisedFunctions {
   }
 
   def missingBearerToken: Future[Result] =
-    Future.successful(Unauthorized(Json.toJson(ApiError.AuthorizationHeaderInvalid)))
+    Future.successful(Unauthorized(Json.toJson(AuthorizationHeaderInvalid)))
   def insufficientEnrolments: Future[Result] =
-    Future.successful(Forbidden(Json.toJson(ApiError.InsufficientEnrolments)))
+    Future.successful(Forbidden(Json.toJson(InsufficientEnrolments)))
   def invalidEmpRef: Future[Result] =
-    Future.successful(Forbidden(Json.toJson(ApiError.InvalidEmpRef)))
+    Future.successful(Forbidden(Json.toJson(InvalidEmpRef)))
 
   private def enrolmentToEmpRef(enrolment: Enrolment): Option[EmpRef] = {
     for {

app/uk/gov/hmrc/epayeapi/controllers/GetEmpRefsController.scala

@@ -23,8 +23,8 @@ import play.api.libs.json.Json
 import play.api.mvc.{Action, AnyContent, EssentialAction}
 import uk.gov.hmrc.auth.core.AuthConnector
 import uk.gov.hmrc.domain.EmpRef
-import uk.gov.hmrc.epayeapi.models.EmpRefsResponse
 import uk.gov.hmrc.epayeapi.models.Formats._
+import uk.gov.hmrc.epayeapi.models.out.EmpRefsResponse
 
 import scala.concurrent.{ExecutionContext, Future}
 

app/uk/gov/hmrc/epayeapi/controllers/GetSummaryController.scala

@@ -26,8 +26,9 @@ import uk.gov.hmrc.auth.core.AuthConnector
 import uk.gov.hmrc.domain.EmpRef
 import uk.gov.hmrc.epayeapi.connectors.EpayeConnector
 import uk.gov.hmrc.epayeapi.models.Formats._
-import uk.gov.hmrc.epayeapi.models.api.{ApiJsonError, ApiNotFound, ApiResponse, ApiSuccess}
-import uk.gov.hmrc.epayeapi.models.{ApiError, SummaryResponse}
+import uk.gov.hmrc.epayeapi.models.in.{ApiJsonError, ApiNotFound, ApiResponse, ApiSuccess}
+import uk.gov.hmrc.epayeapi.models.out.ApiError.EmpRefNotFound
+import uk.gov.hmrc.epayeapi.models.out.{ApiError, SummaryResponse}
 
 import scala.concurrent.ExecutionContext
 
@@ -49,7 +50,7 @@ case class GetSummaryController @Inject() (
           Logger.error(s"Upstream returned invalid json: $err")
           InternalServerError(Json.toJson(ApiError.InternalServerError))
         case ApiNotFound() =>
-          NotFound(Json.toJson(ApiError.EmpRefNotFound))
+          NotFound(Json.toJson(EmpRefNotFound))
         case error: ApiResponse[_] =>
           Logger.error(s"Error while fetching totals: $error")
           InternalServerError(Json.toJson(ApiError.InternalServerError))