Skip to content

Commit ab6b9e6

Browse files
olakunlekuye2olakunlekuye2
committed
clean branch
1 parent 0bcf143 commit ab6b9e6

File tree

8 files changed

+36
-30
lines changed

8 files changed

+36
-30
lines changed

‎app/models/obligationsandsubmissions/Obligation.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ sealed trait ObligationType extends EnumEntry
3737
object ObligationType extends Enum[ObligationType] with PlayJsonEnum[ObligationType] {
3838
val values: IndexedSeq[ObligationType] = findValues
3939

40-
case object Pillar2TaxReturn extends ObligationType
41-
case object GlobeInformationReturn extends ObligationType
40+
case object UKTR extends ObligationType
41+
case object GIR extends ObligationType
4242
}

‎app/models/obligationsandsubmissions/Submission.scala

+8-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,16 @@ sealed trait SubmissionType extends EnumEntry {
3434
object SubmissionType extends Enum[SubmissionType] with PlayJsonEnum[SubmissionType] {
3535
val values: IndexedSeq[SubmissionType] = findValues
3636

37-
case object UKTR extends SubmissionType {
37+
case object UKTR_CREATE extends SubmissionType {
3838
override val fullName: String = "UK Tax Return"
3939
}
40-
case object ORN extends SubmissionType {
40+
case object UKTR_AMEND extends SubmissionType {
41+
override val fullName: String = "UK Tax Return Amend"
42+
}
43+
case object ORN_CREATE extends SubmissionType {
44+
override val fullName: String = "Overseas Return Notification Create"
45+
}
46+
case object ORN_AMEND extends SubmissionType {
4147
override val fullName: String = "Overseas Return Notification"
4248
}
4349
case object BTN extends SubmissionType {

‎conf/messages.en

+2-2
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ dueAndOverdueReturns.table.returnType = Type of return
284284
dueAndOverdueReturns.table.dueDate = Due date
285285
dueAndOverdueReturns.table.status = Status
286286
dueAndOverdueReturns.table.action = Action
287-
dueAndOverdueReturns.obligationType.Pillar2TaxReturn = UK Tax Return
288-
dueAndOverdueReturns.obligationType.GlobeInformationReturn = Information return
287+
dueAndOverdueReturns.obligationType.UKTR = UK Tax Return
288+
dueAndOverdueReturns.obligationType.GIR = Information return
289289
dueAndOverdueReturns.status.overdue = Overdue
290290
dueAndOverdueReturns.status.due = Due
291291
dueAndOverdueReturns.submissionHistory = Submission history

‎test/base/SpecBase.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ trait SpecBase
9696
underEnquiry = false,
9797
obligations = Seq(
9898
Obligation(
99-
obligationType = ObligationType.Pillar2TaxReturn,
99+
obligationType = ObligationType.UKTR,
100100
status = status,
101101
canAmend = false,
102102
submissions = Seq.empty

‎test/controllers/helpers/SubmissionHistoryDataFixture.scala

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package controllers.helpers
1818

1919
import models.obligationsandsubmissions.ObligationStatus.Fulfilled
20-
import models.obligationsandsubmissions.ObligationType.Pillar2TaxReturn
21-
import models.obligationsandsubmissions.SubmissionType.UKTR
20+
import models.obligationsandsubmissions.ObligationType.UKTR
21+
import models.obligationsandsubmissions.SubmissionType.UKTR_CREATE
2222
import models.obligationsandsubmissions._
2323

2424
import java.time.{LocalDate, ZonedDateTime}
@@ -35,17 +35,17 @@ trait SubmissionHistoryDataFixture {
3535
underEnquiry = false,
3636
Seq(
3737
Obligation(
38-
Pillar2TaxReturn,
38+
UKTR,
3939
Fulfilled,
4040
canAmend = true,
4141
Seq(
4242
Submission(
43-
UKTR,
43+
UKTR_CREATE,
4444
ZonedDateTime.now,
4545
None
4646
),
4747
Submission(
48-
UKTR,
48+
UKTR_CREATE,
4949
ZonedDateTime.now,
5050
None
5151
)
@@ -60,12 +60,12 @@ trait SubmissionHistoryDataFixture {
6060
underEnquiry = false,
6161
Seq(
6262
Obligation(
63-
Pillar2TaxReturn,
63+
UKTR,
6464
Fulfilled,
6565
canAmend = true,
6666
Seq(
6767
Submission(
68-
UKTR,
68+
UKTR_CREATE,
6969
ZonedDateTime.now,
7070
None
7171
)

‎test/helpers/DueAndOverdueReturnsDataFixture.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ trait DueAndOverdueReturnsDataFixture {
3333
val futureDueDate: LocalDate = currentDate.plusDays(30) // Always due
3434

3535
def createObligation(
36-
obligationType: ObligationType = ObligationType.Pillar2TaxReturn,
36+
obligationType: ObligationType = ObligationType.UKTR,
3737
status: ObligationStatus = ObligationStatus.Open,
3838
canAmend: Boolean = true
3939
): Obligation =
@@ -72,7 +72,7 @@ trait DueAndOverdueReturnsDataFixture {
7272
obligations = Seq(
7373
createObligation(status = ObligationStatus.Fulfilled),
7474
createObligation(
75-
obligationType = ObligationType.GlobeInformationReturn,
75+
obligationType = ObligationType.GIR,
7676
status = ObligationStatus.Fulfilled
7777
)
7878
)
@@ -112,7 +112,7 @@ trait DueAndOverdueReturnsDataFixture {
112112
obligations = Seq(
113113
createObligation(),
114114
createObligation(
115-
obligationType = ObligationType.GlobeInformationReturn,
115+
obligationType = ObligationType.GIR,
116116
status = ObligationStatus.Fulfilled
117117
)
118118
)
@@ -136,7 +136,7 @@ trait DueAndOverdueReturnsDataFixture {
136136
obligations = Seq(
137137
createObligation(),
138138
createObligation(
139-
obligationType = ObligationType.GlobeInformationReturn
139+
obligationType = ObligationType.GIR
140140
)
141141
)
142142
)

‎test/helpers/TestDataFixture.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package helpers
1818

1919
import models.btn.BTNStatus
2020
import models.obligationsandsubmissions.ObligationStatus.Fulfilled
21-
import models.obligationsandsubmissions.ObligationType.Pillar2TaxReturn
22-
import models.obligationsandsubmissions.SubmissionType.UKTR
21+
import models.obligationsandsubmissions.ObligationType.UKTR
22+
import models.obligationsandsubmissions.SubmissionType.UKTR_CREATE
2323
import models.obligationsandsubmissions._
2424
import models.subscription._
2525
import models.{MneOrDomestic, NonUKAddress, UserAnswers}
@@ -54,10 +54,10 @@ trait TestDataFixture extends SubscriptionLocalDataFixture {
5454

5555
def obligationsAndSubmissionsSuccessResponse(
5656
underEnquiry: Boolean = false,
57-
obligationType: ObligationType = Pillar2TaxReturn,
57+
obligationType: ObligationType = ObligationType.UKTR,
5858
status: ObligationStatus = Fulfilled,
5959
canAmend: Boolean = true,
60-
submissionType: SubmissionType = UKTR,
60+
submissionType: SubmissionType = UKTR_CREATE,
6161
receivedDate: ZonedDateTime = testZonedDateTime,
6262
country: Option[String] = None
6363
): ObligationsAndSubmissionsSuccessResponse =

‎test/views/helpers/SubmissionHistoryHelperSpec.scala

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package views.helpers
1818

1919
import models.obligationsandsubmissions.ObligationStatus.{Fulfilled, Open}
20-
import models.obligationsandsubmissions.ObligationType.{GlobeInformationReturn, Pillar2TaxReturn}
21-
import models.obligationsandsubmissions.SubmissionType.{GIR, UKTR}
20+
import models.obligationsandsubmissions.ObligationType
21+
import models.obligationsandsubmissions.SubmissionType
2222
import models.obligationsandsubmissions.{AccountingPeriodDetails, Obligation, Submission}
2323
import org.mockito.Mockito.when
2424
import org.scalatest.matchers.should.Matchers
@@ -40,12 +40,12 @@ class SubmissionHistoryHelperSpec extends AnyWordSpec with Matchers with Mockito
4040
val startDate2 = LocalDate.of(2023, 1, 1)
4141
val endDate2 = LocalDate.of(2023, 12, 31)
4242

43-
val submission1 = Submission(UKTR, ZonedDateTime.now, None)
44-
val submission2 = Submission(GIR, ZonedDateTime.now, None)
43+
val submission1 = Submission(SubmissionType.UKTR_CREATE, ZonedDateTime.now, None)
44+
val submission2 = Submission(SubmissionType.GIR, ZonedDateTime.now, None)
4545

46-
val obligation1 = Obligation(Pillar2TaxReturn, Open, canAmend = true, Seq(submission1, submission2))
47-
val obligation2 = Obligation(GlobeInformationReturn, Fulfilled, canAmend = false, Seq(submission1))
48-
val obligation3 = Obligation(Pillar2TaxReturn, Open, canAmend = true, Seq.empty)
46+
val obligation1 = Obligation(ObligationType.UKTR, Open, canAmend = true, Seq(submission1, submission2))
47+
val obligation2 = Obligation(ObligationType.GIR, Fulfilled, canAmend = false, Seq(submission1))
48+
val obligation3 = Obligation(ObligationType.UKTR, Open, canAmend = true, Seq.empty)
4949

5050
val accountingPeriods = Seq(
5151
AccountingPeriodDetails(startDate1, endDate1, LocalDate.now, underEnquiry = false, Seq(obligation1)),
@@ -75,7 +75,7 @@ class SubmissionHistoryHelperSpec extends AnyWordSpec with Matchers with Mockito
7575
"create table rows correctly" in {
7676
val submissionDate = ZonedDateTime.now.format(DateTimeFormatter.ofPattern("d MMMM yyyy"))
7777

78-
val submission = Submission(UKTR, ZonedDateTime.now, None)
78+
val submission = Submission(SubmissionType.UKTR_CREATE, ZonedDateTime.now, None)
7979
val rows = SubmissionHistoryHelper.createTableRows(submission)
8080
rows should have length 2
8181
rows.head.content shouldBe Text("UK Tax Return")

0 commit comments

Comments
 (0)