Bugfix: Fix excessive api requests triggering genderdecoder

openapi/openapi.yaml

@@ -110,16 +110,14 @@ paths:
       requestBody:
         content:
           application/json:
-            schema: {$ref: '#/components/schemas/JobFormDTO'}
+            schema: {$ref: '#/components/schemas/AnalyzeJobDescriptionRequestDTO'}
         required: true
       responses:
         '200':
           description: OK
           content:
             application/json:
-              schema:
-                type: array
-                items: {$ref: '#/components/schemas/ComplianceIssue'}
+              schema: {$ref: '#/components/schemas/JobAnalysisDTO'}
   /api/ai/extractPdfData:
     put:
       tags: [ai-resource]
@@ -1429,36 +1427,6 @@ paths:
           content:
             application/pdf:
               schema: {type: string, format: binary}
-  /api/gender-bias/analyze:
-    post:
-      tags: [gender-bias-analysis-resource]
-      operationId: analyzeText
-      requestBody:
-        content:
-          application/json:
-            schema: {$ref: '#/components/schemas/GenderBiasAnalysisRequest'}
-        required: true
-      responses:
-        '200':
-          description: OK
-          content:
-            application/json:
-              schema: {$ref: '#/components/schemas/GenderBiasAnalysisResponse'}
-  /api/gender-bias/analyze-html:
-    post:
-      tags: [gender-bias-analysis-resource]
-      operationId: analyzeHtmlContent
-      requestBody:
-        content:
-          application/json:
-            schema: {$ref: '#/components/schemas/GenderBiasAnalysisRequest'}
-        required: true
-      responses:
-        '200':
-          description: OK
-          content:
-            application/json:
-              schema: {$ref: '#/components/schemas/GenderBiasAnalysisResponse'}
   /api/images/defaults/job-banners:
     get:
       tags: [image-resource]
@@ -2047,6 +2015,26 @@ paths:
           content:
             application/json:
               schema: {$ref: '#/components/schemas/PageAdminCreatedJobDTO'}
+  /api/jobs/analyze-gender-bias:
+    post:
+      tags: [job-resource]
+      operationId: analyzeGenderBias
+      parameters:
+      - name: lang
+        in: query
+        required: true
+        schema: {type: string}
+      requestBody:
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/AnalyzeJobDescriptionRequestDTO'}
+        required: true
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema: {$ref: '#/components/schemas/JobAnalysisDTO'}
   /api/jobs/available:
     get:
       tags: [job-resource]
@@ -3111,6 +3099,14 @@ components:
     AiUsageTimeRange:
       type: string
       enum: [LAST_DAY, LAST_WEEK, LAST_MONTH, LAST_THREE_MONTHS, ALL_TIME]
+    AnalyzeJobDescriptionRequestDTO:
+      type: object
+      properties:
+        jobDescriptionDE: {type: string}
+        jobDescriptionEN: {type: string}
+        jobId: {type: string, format: uuid}
+        title: {type: string}
+      required: [jobId]
     ApplicantDTO:
       type: object
       properties:
@@ -3294,10 +3290,13 @@ components:
         expiresIn: {type: integer, format: int64}
         profileRequired: {type: boolean}
         refreshExpiresIn: {type: integer, format: int64}
-    BiasedWordDTO:
+    BiasedIssueDTO:
       type: object
       properties:
-        type: {type: string}
+        language: {type: string}
+        type:
+          type: string
+          enum: [NON_INCLUSIVE, INCLUSIVE]
         word: {type: string}
     BookSlotRequestDTO:
       type: object
@@ -3320,7 +3319,7 @@ components:
         deleteSlot: {type: boolean}
         sendReinvite: {type: boolean}
       required: [deleteSlot, sendReinvite]
-    ComplianceIssue:
+    ComplianceIssueDTO:
       type: object
       properties:
         action:
@@ -3528,20 +3527,6 @@ components:
         masterDegreeName: {type: string}
         masterGrade: {type: string}
         masterUniversity: {type: string}
-    GenderBiasAnalysisRequest:
-      type: object
-      properties:
-        language: {type: string}
-        text: {type: string}
-    GenderBiasAnalysisResponse:
-      type: object
-      properties:
-        biasedWords:
-          type: array
-          items: {$ref: '#/components/schemas/BiasedWordDTO'}
-        coding: {type: string}
-        language: {type: string}
-        originalText: {type: string}
     ImageDTO:
       type: object
       properties:
@@ -3636,6 +3621,16 @@ components:
         firstName: {type: string}
         lastName: {type: string}
         userId: {type: string, format: uuid}
+    JobAnalysisDTO:
+      type: object
+      properties:
+        aiScore: {type: integer, format: int32}
+        biasedIssues:
+          type: array
+          items: {$ref: '#/components/schemas/BiasedIssueDTO'}
+        complianceIssues:
+          type: array
+          items: {$ref: '#/components/schemas/ComplianceIssueDTO'}
     JobCardDTO:
       type: object
       properties:
@@ -3677,16 +3672,19 @@ components:
     JobDTO:
       type: object
       properties:
+        aiScore: {type: integer, format: int32}
+        biasedIssues:
+          type: array
+          items: {$ref: '#/components/schemas/BiasedIssueDTO'}
         complianceIssues:
           type: array
-          items: {$ref: '#/components/schemas/ComplianceIssue'}
+          items: {$ref: '#/components/schemas/ComplianceIssueDTO'}
         contractDuration: {type: integer, format: int32}
         endDate: {type: string, format: date}
         fundingType:
           type: string
           enum: [FULLY_FUNDED, PARTIALLY_FUNDED, SCHOLARSHIP, SELF_FUNDED, INDUSTRY_SPONSORED,
             GOVERNMENT_FUNDED, RESEARCH_GRANT]
-        genderBiasScore: {type: integer, format: int32}
         imageId: {type: string, format: uuid}
         imageUrl: {type: string}
         jobDescriptionDE: {type: string}
@@ -3804,16 +3802,19 @@ components:
     JobFormDTO:
       type: object
       properties:
+        aiScore: {type: integer, format: int32}
+        biasedIssues:
+          type: array
+          items: {$ref: '#/components/schemas/BiasedIssueDTO'}
         complianceIssues:
           type: array
-          items: {$ref: '#/components/schemas/ComplianceIssue'}
+          items: {$ref: '#/components/schemas/ComplianceIssueDTO'}
         contractDuration: {type: integer, format: int32}
         endDate: {type: string, format: date}
         fundingType:
           type: string
           enum: [FULLY_FUNDED, PARTIALLY_FUNDED, SCHOLARSHIP, SELF_FUNDED, INDUSTRY_SPONSORED,
             GOVERNMENT_FUNDED, RESEARCH_GRANT]
-        genderBiasScore: {type: integer, format: int32}
         imageId: {type: string, format: uuid}
         jobDescriptionDE: {type: string}
         jobDescriptionEN: {type: string}
@@ -4307,7 +4308,6 @@ components:
     TranslateComplianceDTO:
       type: object
       properties:
-        originalAnalysis: {$ref: '#/components/schemas/GenderBiasAnalysisResponse'}
         text: {type: string, minLength: 1}
       required: [text]
     UpcomingInterviewDTO:

src/main/java/de/tum/cit/aet/ai/domain/BiasedIssue.java

@@ -0,0 +1,26 @@
+package de.tum.cit.aet.ai.domain;
+
+import de.tum.cit.aet.core.constants.GenderCategory;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@Embeddable
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode
+public class BiasedIssue {
+
+    private String language;
+    private String word;
+
+    @Enumerated(EnumType.STRING)
+    private GenderCategory type;
+}

src/main/java/de/tum/cit/aet/ai/dto/AnalyzeJobDescriptionRequestDTO.java

@@ -0,0 +1,6 @@
+package de.tum.cit.aet.ai.dto;
+
+import jakarta.validation.constraints.NotNull;
+import java.util.UUID;
+
+public record AnalyzeJobDescriptionRequestDTO(@NotNull UUID jobId, String title, String jobDescriptionEN, String jobDescriptionDE) {}

src/main/java/de/tum/cit/aet/ai/dto/BiasedIssueDTO.java

@@ -0,0 +1,12 @@
+package de.tum.cit.aet.ai.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import de.tum.cit.aet.ai.domain.BiasedIssue;
+import de.tum.cit.aet.core.constants.GenderCategory;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record BiasedIssueDTO(String language, String word, GenderCategory type) {
+    public static BiasedIssueDTO from(BiasedIssue issue) {
+        return new BiasedIssueDTO(issue.getLanguage(), issue.getWord(), issue.getType());
+    }
+}

src/main/java/de/tum/cit/aet/ai/dto/ComplianceIssueDTO.java

@@ -0,0 +1,35 @@
+package de.tum.cit.aet.ai.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import de.tum.cit.aet.ai.constants.ComplianceAction;
+import de.tum.cit.aet.ai.constants.ComplianceCategory;
+import de.tum.cit.aet.ai.domain.ComplianceIssue;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record ComplianceIssueDTO(
+    String id,
+    ComplianceCategory category,
+    String text,
+    String article,
+    String explanation,
+    ComplianceAction action,
+    String language
+) {
+    /**
+     * Creates a DTO from a persisted compliance issue.
+     *
+     * @param issue the persisted compliance issue
+     * @return the mapped compliance issue DTO
+     */
+    public static ComplianceIssueDTO from(ComplianceIssue issue) {
+        return new ComplianceIssueDTO(
+            issue.getId(),
+            issue.getCategory(),
+            issue.getText(),
+            issue.getArticle(),
+            issue.getExplanation(),
+            issue.getAction(),
+            issue.getLanguage()
+        );
+    }
+}

src/main/java/de/tum/cit/aet/ai/dto/JobAnalysisDTO.java

@@ -0,0 +1,26 @@
+package de.tum.cit.aet.ai.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import de.tum.cit.aet.ai.domain.BiasedIssue;
+import de.tum.cit.aet.ai.domain.ComplianceIssue;
+import java.util.List;
+import java.util.Set;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record JobAnalysisDTO(Integer aiScore, List<ComplianceIssueDTO> complianceIssues, List<BiasedIssueDTO> biasedIssues) {
+    /**
+     * Creates an analysis DTO from the persisted issues.
+     *
+     * @param aiScore the combined AI score
+     * @param complianceIssues the persisted compliance issues
+     * @param biasedIssues the persisted biased-language issues
+     * @return the mapped analysis DTO
+     */
+    public static JobAnalysisDTO from(Integer aiScore, List<ComplianceIssue> complianceIssues, Set<BiasedIssue> biasedIssues) {
+        return new JobAnalysisDTO(
+            aiScore,
+            complianceIssues.stream().map(ComplianceIssueDTO::from).toList(),
+            biasedIssues.stream().map(BiasedIssueDTO::from).toList()
+        );
+    }
+}

src/main/java/de/tum/cit/aet/ai/dto/TranslateComplianceDTO.java

@@ -1,9 +1,7 @@
 package de.tum.cit.aet.ai.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import de.tum.cit.aet.core.dto.GenderBiasAnalysisResponse;
-import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotBlank;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public record TranslateComplianceDTO(@NotBlank String text, @Nullable GenderBiasAnalysisResponse originalAnalysis) {}
+public record TranslateComplianceDTO(@NotBlank String text) {}