Merge pull request #1022 from hmrc/DL-14575

DL-14575: VAT API-Removed scopes and refactored Unit and func test
hmrc · Oct 14, 2024 · 915e674 · 915e674
2 parents 2b5aa60 + 97e6846
commit 915e674
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 44 deletions.
diff --git a/app/definition/ApiDefinition.scala b/app/definition/ApiDefinition.scala
@@ -72,13 +72,7 @@ object APIDefinition {
   implicit val formatAPIDefinition: OFormat[APIDefinition] = Json.format[APIDefinition]
 }
 
-case class Scope(key: String, name: String, description: String)
-
-object Scope {
-  implicit val formatScope: OFormat[Scope] = Json.format[Scope]
-}
-
-case class Definition(scopes: Seq[Scope], api: APIDefinition)
+case class Definition(api: APIDefinition)
 
 object Definition {
   implicit val formatDefinition: OFormat[Definition] = Json.format[Definition]

diff --git a/app/definition/ApiDefinitionFactory.scala b/app/definition/ApiDefinitionFactory.scala
@@ -30,19 +30,7 @@ class ApiDefinitionFactory @Inject()(appConfig: AppConfig) extends Logging{
 
   lazy val definition: Definition =
     Definition(
-      scopes = Seq(
-        Scope(
-          key = readScope,
-          name = "View your VAT information",
-          description = "Allow read access to VAT data"
-        ),
-        Scope(
-          key = writeScope,
-          name = "Change your VAT information",
-          description = "Allow write access to VAT data"
-        )
-      ),
-      api = APIDefinition(
+     api = APIDefinition(
         name = "VAT (MTD)",
         description =
           "An API for providing VAT data",

diff --git a/func/test/config/DocumentationControllerISpec.scala b/func/test/config/DocumentationControllerISpec.scala
@@ -43,18 +43,6 @@ class DocumentationControllerISpec extends IntegrationBaseSpec with FeatureToggl
   val apiDefinitionJson: JsValue = Json.parse(
     """
       |{
-      |  "scopes":[
-      |    {
-      |      "key":"read:vat",
-      |      "name":"View your VAT information",
-      |      "description":"Allow read access to VAT data"
-      |    },
-      |    {
-      |      "key":"write:vat",
-      |      "name":"Change your VAT information",
-      |      "description":"Allow write access to VAT data"
-      |    }
-      |  ],
       |  "api":{
       |    "name":"VAT (MTD)",
       |    "description":"An API for providing VAT data",

diff --git a/test/definition/ApiDefinitionFactorySpec.scala b/test/definition/ApiDefinitionFactorySpec.scala
@@ -41,18 +41,6 @@ class ApiDefinitionFactorySpec extends UnitSpec {
 
         apiDefinitionFactory.definition shouldBe
           Definition(
-            scopes = Seq(
-              Scope(
-                key = readScope,
-                name = "View your VAT information",
-                description = "Allow read access to VAT data"
-              ),
-              Scope(
-                key = writeScope,
-                name = "Change your VAT information",
-                description = "Allow write access to VAT data"
-              )
-            ),
             api = APIDefinition(
               name = "VAT (MTD)",
               description =