open_api/build.gradle.kts

@@ -44,17 +44,11 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-validation")
     implementation("io.swagger.core.v3:swagger-annotations:2.2.20")
-    implementation("io.swagger.core.v3:swagger-models:2.2.8")
-    implementation("io.swagger.core.v3:swagger-core:2.2.8")
-
     implementation("org.openapitools:jackson-databind-nullable:0.2.6")
     implementation("org.springframework.hateoas:spring-hateoas:2.2.0")
 }
 
 tasks.register< GenerateTask>("generateJavaApi") {
-    inputs.file("${projectDir}/src/main/resources/api.yml")
-    inputs.file("${projectDir}/src/main/resources/config_backend.json")
-    inputs.dir("${projectDir}/src/main/resources/schemas")
     generatorName.set("spring")
     library.set("spring-boot")
     inputSpec.set("${projectDir}/src/main/resources/api.yml")
@@ -73,9 +67,6 @@ tasks.register< GenerateTask>("generateJavaApi") {
 }
 
 tasks.register<GenerateTask>("generateFrontendApi") {
-    inputs.file("${projectDir}/src/main/resources/api.yml")
-    inputs.file("${projectDir}/src/main/resources/config_backend.json")
-    inputs.dir("${projectDir}/src/main/resources/schemas")
     generatorName.set("typescript-angular")
     inputSpec.set("$rootDir/open_api/src/main/resources/api.yml")
     outputDir.set("${projectDir}/../frontend/src/api")

open_api/src/main/resources/api.yml

@@ -13,10 +13,10 @@ tags:
     description: Retrieves information about the staff team
 paths:
   /team/{team}:
-    $ref: './schemas/team/team.yml#/getTeam'
+    $ref: './sub_api/team/team.yml#/getTeam'
   /history/{userType}/search/{type}:
-    $ref: './schemas/bans/bans.yml#/getUserNames'
+    $ref: './sub_api/bans/bans.yml#/getUserNames'
   /history/{userType}/{type}/{user}:
-    $ref: './schemas/bans/bans.yml#/getHistoryForUsers'
+    $ref: './sub_api/bans/bans.yml#/getHistoryForUsers'
   /history/{userType}/{type}/{uuid}:
-    $ref: './schemas/bans/bans.yml#/getHistoryForUuid'
+    $ref: './sub_api/bans/bans.yml#/getHistoryForUuid'

open_api/src/main/resources/sub_api/bans/bans.yml

@@ -23,7 +23,7 @@ getUserNames:
       content:
         application/json:
           schema:
-            $ref: "../generic/errors.yml#/components/schemas/ApiError"
+            $ref: "../generic/errors.yml#/components/schemas/Error"
 getHistoryForUsers:
   post:
     tags:
@@ -49,7 +49,7 @@ getHistoryForUsers:
       content:
         application/json:
           schema:
-            $ref: "../generic/errors.yml#/components/schemas/ApiError"
+            $ref: "../generic/errors.yml#/components/schemas/Error"
 getHistoryForUuid:
   post:
     tags:
@@ -75,7 +75,7 @@ getHistoryForUuid:
       content:
         application/json:
           schema:
-            $ref: "../generic/errors.yml#/components/schemas/ApiError"
+            $ref: "../generic/errors.yml#/components/schemas/Error"
 components:
   parameters:
     HistoryType:
@@ -143,9 +143,6 @@ components:
           removedBy:
             type: string
             description: The name of the staff member who removed the punishment
-          removedReason:
-            type: string
-            description: The reason why the punishment was removed
     Player:
       type: object
       properties:

open_api/src/main/resources/sub_api/generic/errors.yml

@@ -1,6 +1,6 @@
 components:
   schemas:
-    ApiError:
+    Error:
       type: object
       properties:
         reason:

open_api/src/main/resources/sub_api/team/team.yml

@@ -24,7 +24,7 @@ getTeam:
         content:
           application/json:
             schema:
-              $ref: "../generic/errors.yml#/components/schemas/ApiError"
+              $ref: "../generic/errors.yml#/components/schemas/Error"
 components:
   schemas:
     TeamMembers: