Skip to content

Commit

Permalink
REFACTOR: Removed Cleared from the annual statement
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomas-vogel444
thomas-vogel444 committed Dec 12, 2017
1 parent 171f1c0 commit 5851618
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 167 deletions.
11 changes: 4 additions & 7 deletions app/uk/gov/hmrc/epayeapi/models/in/EpayeAnnualStatement.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,12 @@ package uk.gov.hmrc.epayeapi.models.in
import org.joda.time.LocalDate
import uk.gov.hmrc.epayeapi.models.TaxYear

case class Cleared(
payment: BigDecimal = 0,
credit: BigDecimal = 0
)

case class LineItem(
taxYear: TaxYear,
taxMonth: Option[EpayeTaxMonth],
charges: BigDecimal,
cleared: Cleared,
payments: BigDecimal,
credits: BigDecimal,
balance: BigDecimal,
dueDate: LocalDate,
isSpecified: Boolean = false,
Expand All @@ -38,7 +34,8 @@ case class LineItem(

case class AnnualTotal(
charges: BigDecimal,
cleared: Cleared,
payments: BigDecimal,
credits: BigDecimal,
balance: BigDecimal
)

Expand Down
1 change: 0 additions & 1 deletion app/uk/gov/hmrc/epayeapi/models/in/EpayeReads.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ trait EpayeReads {
implicit lazy val taxYearReads: Reads[TaxYear] = reads[TaxYear]
implicit lazy val epayeTaxMonthReads: Reads[EpayeTaxMonth] = reads[EpayeTaxMonth]

implicit lazy val clearedReads: Reads[Cleared] = reads[Cleared]
implicit lazy val annualTotalReads: Reads[AnnualTotal] = reads[AnnualTotal]
implicit lazy val lineItemReads: Reads[LineItem] = reads[LineItem]

Expand Down
12 changes: 6 additions & 6 deletions app/uk/gov/hmrc/epayeapi/models/out/AnnualStatementJson.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ object NonRtiChargesJson {
} yield NonRtiChargesJson(
code = code,
amount = lineItem.charges,
clearedByCredits = lineItem.cleared.credit,
clearedByPayments = lineItem.cleared.payment,
clearedByCredits = lineItem.credits,
clearedByPayments = lineItem.payments,
balance = lineItem.balance,
dueDate = lineItem.dueDate
)
Expand All @@ -67,8 +67,8 @@ object EarlierYearUpdateJson {
.map { lineItem =>
EarlierYearUpdateJson(
lineItem.charges,
lineItem.cleared.credit,
lineItem.cleared.payment,
lineItem.credits,
lineItem.payments,
lineItem.balance,
lineItem.dueDate
)
Expand Down Expand Up @@ -101,8 +101,8 @@ object MonthlyChargesJson {
} yield MonthlyChargesJson(
taxMonth = taxMonth,
amount = lineItem.charges,
clearedByCredits = lineItem.cleared.credit,
clearedByPayments = lineItem.cleared.payment,
clearedByCredits = lineItem.credits,
clearedByPayments = lineItem.payments,
balance = lineItem.balance,
dueDate = lineItem.dueDate,
isSpecified = lineItem.isSpecified,
Expand Down
102 changes: 24 additions & 78 deletions test/common/Fixtures.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,10 @@ object Fixtures {
| "taxMonth": {
| "month": 7
| },
| "charges": {
| "debit": 1200,
| "credit": 0
| },
| "cleared": {
| "cleared": 0,
| "payment": 0,
| "credit": 0
| },
| "balance": {
| "debit": 1200,
| "credit": 0
| },
| "charges":1200,
| "payments": 0,
| "credits": 0,
| "balance": 1200,
| "dueDate": "2017-11-22",
| "isSpecified": false,
| "itemType": "month"
Expand All @@ -54,19 +45,10 @@ object Fixtures {
| "taxYear": {
| "yearFrom": 2017
| },
| "charges": {
| "debit": 700,
| "credit": 0
| },
| "cleared": {
| "cleared": 0,
| "payment": 300,
| "credit": 200
| },
| "balance": {
| "debit": 200,
| "credit": 0
| },
| "charges":700,
| "payments": 300,
| "credits": 200,
| "balance": 200,
| "dueDate": "2017-04-22",
| "isSpecified": false,
| "itemType": "eyu"
Expand All @@ -78,37 +60,19 @@ object Fixtures {
| "taxMonth": {
| "month": 3
| },
| "charges": {
| "debit": 700,
| "credit": 0
| },
| "cleared": {
| "cleared": 0,
| "payment": 300,
| "credit": 200
| },
| "balance": {
| "debit": 200,
| "credit": 0
| },
| "charges":700,
| "payments": 300,
| "credits": 200,
| "balance": 200,
| "dueDate": "2017-07-22",
| "isSpecified": true
| }
| ],
| "totals": {
| "charges": {
| "debit": 1900,
| "credit": 0
| },
| "cleared": {
| "cleared": 0,
| "payment": 300,
| "credit": 200
| },
| "balance": {
| "debit": 1400,
| "credit": 0
| }
| "charges":1900,
| "payments": 300,
| "credits": 200,
| "balance": 1400
| }
| },
| "nonRti": {
Expand All @@ -117,39 +81,21 @@ object Fixtures {
| "taxYear": {
| "yearFrom": 2017
| },
| "charges": {
| "debit": 300,
| "credit": 0
| },
| "cleared": {
| "cleared": 100,
| "payment": 30,
| "credit": 70
| },
| "balance": {
| "debit": 200,
| "credit": 0
| },
| "charges":300,
| "payments": 30,
| "credits": 70,
| "balance": 200,
| "dueDate": "2017-07-22",
| "isSpecified": false,
| "itemType": "1481",
| "codeText": "NON_RTI_CIS_FIXED_PENALTY"
| }
| ],
| "totals": {
| "charges": {
| "debit": 0,
| "credit": 0
| },
| "cleared": {
| "cleared": 0,
| "payment": 0,
| "credit": 0
| },
| "balance": {
| "debit": 0,
| "credit": 0
| }
| "charges":0,
| "payments": 0,
| "credits": 0,
| "balance": 0
| }
| },
| "unallocated": 2000
Expand Down
64 changes: 16 additions & 48 deletions test/resources/epaye/annual-statement/annual-statement.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,19 @@
"taxMonth": {
"month": 1
},
"charges": {
"debit": 100.2,
"credit": 0
},
"cleared": {
"payment": 0,
"credit": 0
},
"balance": {
"debit": 100.2,
"credit": 0
},
"charges": 100.2,
"payments": 0,
"credits": 0,
"balance": 100.2,
"dueDate": "2017-05-22",
"isSpecified": false
}
],
"totals": {
"charges": {
"debit": 100.2,
"credit": 0
},
"cleared": {
"payment": 0,
"credit": 0
},
"balance": {
"debit": 100.2,
"credit": 0
}
"charges": 100.2,
"payments": 0,
"credits": 0,
"balance": 100.2
}
},
"nonRti": {
Expand All @@ -45,36 +29,20 @@
"taxYear": {
"yearFrom": 2017
},
"charges": {
"debit": 20.0,
"credit": 0
},
"cleared": {
"payment": 0,
"credit": 0
},
"balance": {
"debit": 20.0,
"credit": 0
},
"charges": 20.0,
"payments": 0,
"credits": 0,
"balance": 20.0,
"dueDate": "2018-02-22",
"isSpecified": false,
"codeText": "P11D_CLASS_1A_CHARGE"
}
],
"totals": {
"charges": {
"debit": 20.0,
"credit": 0
},
"cleared": {
"payment": 0,
"credit": 0
},
"balance": {
"debit": 20.0,
"credit": 0
}
"charges": 20.0,
"payments": 0,
"credits": 0,
"balance": 20.0
}
}
}
18 changes: 6 additions & 12 deletions test/uk/gov/hmrc/epayeapi/connectors/EpayeConnectorSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,12 @@ class EpayeConnectorSpec extends UnitSpec with MockitoSugar with ScalaFutures {
|{
| "rti": {
| "totals": {
| "balance": {
| "debit": 100,
| "credit": 0
| }
| "balance": 100
| }
| },
| "nonRti": {
| "totals": {
| "balance": {
| "debit": 23,
| "credit": 0
| }
| "balance": 23
| }
| }
|}
Expand Down Expand Up @@ -99,12 +93,12 @@ class EpayeConnectorSpec extends UnitSpec with MockitoSugar with ScalaFutures {
EpayeSuccess(
EpayeAnnualStatement(
rti = AnnualStatementTable(
List(LineItem(TaxYear(2017), Some(EpayeTaxMonth(1)), 100.2, Cleared(0, 0), 100.2, new LocalDate(2017, 5, 22), isSpecified = false, codeText = None)),
AnnualTotal(100.2, Cleared(0, 0), 100.2)
List(LineItem(TaxYear(2017), Some(EpayeTaxMonth(1)), 100.2, 0, 0, 100.2, new LocalDate(2017, 5, 22), isSpecified = false, codeText = None)),
AnnualTotal(100.2, 0, 0, 100.2)
),
nonRti = AnnualStatementTable(
List(LineItem(TaxYear(2017), None, 20.0, Cleared(0, 0), 20.0, new LocalDate(2018, 2, 22), false, Some("P11D_CLASS_1A_CHARGE"))),
AnnualTotal(20.0, Cleared(0, 0), 20.0)
List(LineItem(TaxYear(2017), None, 20.0, 0, 0, 20.0, new LocalDate(2018, 2, 22), false, Some("P11D_CLASS_1A_CHARGE"))),
AnnualTotal(20.0, 0, 0, 20.0)
),
unallocated = None
)
Expand Down
10 changes: 2 additions & 8 deletions test/uk/gov/hmrc/epayeapi/controllers/GetSummarySpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,12 @@ class GetSummarySpec extends AppSpec with BeforeAndAfterEach {
|{
| "rti": {
| "totals": {
| "balance": {
| "debit": 100,
| "credit": 0
| }
| "balance": 100
| }
| },
| "nonRti": {
| "totals": {
| "balance": {
| "debit": 23,
| "credit": 0
| }
| "balance": 23
| }
| }
|}
Expand Down
6 changes: 4 additions & 2 deletions test/uk/gov/hmrc/epayeapi/models/JsonFixtures.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,17 @@ object JsonFixtures {
lineItems = Seq(),
totals = AnnualTotal(
charges = 0,
cleared = Cleared(0, 0),
payments = 0,
credits = 0,
balance = 0
)
),
nonRti = AnnualStatementTable(
lineItems = Seq(),
totals = AnnualTotal(
charges = 0,
cleared = Cleared(0),
payments = 0,
credits = 0,
balance = 0
)
),
Expand Down
Loading

0 comments on commit 5851618

Please sign in to comment.