APSR-1931 - Update to also check the APIs categories for fraud prevention info (#521)

Author: Tobias1087

app/uk/gov/hmrc/apidocumentation/controllers/ApiDocumentationController.scala

@@ -246,7 +246,7 @@ class ApiDocumentationController @Inject() (
         } yield Ok(parentPage(attrs, markdownBlocks, api.name, api, selectedVersion, developerId.isDefined, useV2 = useV2)).withHeaders(cacheControlHeaders)
       }
 
-      val categories = APICategoryFilters.categoryMap.getOrElse(api.name, Seq.empty)
+      val categories = APICategoryFilters.categoryMap.getOrElse(api.name, Seq.empty) ++ api.categories
       documentationService.fetchApiSpecification(service, version, cacheBuster).flatMap(_.fold(renderOas(categories))(renderRamlSpec))
     }
 

resources/categories.json

@@ -16,8 +16,7 @@
   "Individual Benefits": ["SELF_ASSESSMENT"],
   "Individual Employment": ["SELF_ASSESSMENT"],
   "Individual Income": ["SELF_ASSESSMENT"],
-  "Individual Losses (MTD)": ["INCOME_TAX_MTD"],
-  "Individual Calculations (MTD)": ["INCOME_TAX_MTD"],
+
   "Individual PAYE": ["PAYE", "SELF_ASSESSMENT"],
   "Individual Tax": ["SELF_ASSESSMENT"],
   "Individuals": ["PRIVATE_GOVERNMENT"],

test/uk/gov/hmrc/apidocumentation/controllers/ApiDocumentationControllerSpec.scala

@@ -25,6 +25,7 @@ import org.apache.pekko.stream.Materializer
 import play.api.http.Status.{INTERNAL_SERVER_ERROR, NOT_FOUND, OK, SEE_OTHER}
 import play.api.mvc.MessagesControllerComponents
 import play.api.test.Helpers._
+import uk.gov.hmrc.apiplatform.modules.apis.domain.models.ApiCategory.VAT_MTD
 import uk.gov.hmrc.apiplatform.modules.apis.domain.models._
 import uk.gov.hmrc.apiplatform.modules.common.domain.models._
 import uk.gov.hmrc.http.NotFoundException
@@ -472,7 +473,7 @@ class ApiDocumentationControllerSpec extends CommonControllerBaseSpec with PageR
           verifyNotFoundPageRendered(result)
         }
 
-        "display the OAS when no RAML is found including fraud prevention information" in new Setup {
+        "display the OAS when no RAML is found including fraud prevention information using info from Cat Map" in new Setup {
           theUserIsLoggedIn()
 
           theDefinitionServiceWillReturnAnApiDefinition(
@@ -489,6 +490,23 @@ class ApiDocumentationControllerSpec extends CommonControllerBaseSpec with PageR
           contentAsString(result) should include("Fraud Prevention")
         }
 
+        "display the OAS when no RAML is found including fraud prevention information using info from Api" in new Setup {
+          theUserIsLoggedIn()
+
+          theDefinitionServiceWillReturnAnApiDefinition(
+            extendedApiDefinition(serviceName = serviceName.value).copy(categories = List(VAT_MTD))
+          )
+
+          theDocumentationServiceWillFetchNoSpecification()
+          when(downloadConnector.fetch(*[ServiceName], *[ApiVersionNbr], *)).thenReturn(successful(None))
+
+          val result = underTest.renderApiDocumentation(serviceName, versionOne, Option(true), None)(request)
+
+          status(result) shouldBe OK
+          contentAsString(result) should include("Endpoints")
+          contentAsString(result) should include("Fraud Prevention")
+        }
+
         "render OAS for a test support API without including fraud prevention information" in new Setup {
           theUserIsLoggedIn()
 
@@ -506,6 +524,24 @@ class ApiDocumentationControllerSpec extends CommonControllerBaseSpec with PageR
           contentAsString(result) should include("Endpoints")
           contentAsString(result) should not include ("Fraud Prevention")
         }
+
+        "display the OAS when no RAML is found not including fraud prevention information" in new Setup {
+          theUserIsLoggedIn()
+
+          theDefinitionServiceWillReturnAnApiDefinition(
+            extendedApiDefinition(serviceName = serviceName.value)
+          )
+
+          theDocumentationServiceWillFetchNoSpecification()
+          when(downloadConnector.fetch(*[ServiceName], *[ApiVersionNbr], *)).thenReturn(successful(None))
+
+          val result = underTest.renderApiDocumentation(serviceName, versionOne, Option(true), None)(request)
+
+          status(result) shouldBe OK
+          println(contentAsString(result))
+          contentAsString(result) should include("Endpoints")
+          contentAsString(result) should not include ("Fraud Prevention")
+        }
       }
 
       "display the not found page when invalid service specified" in new Setup {