Merge remote-tracking branch 'origin/main' into 1342-server-tests-for-gender-decoder

Author: Kiara65

openapi/openapi.yaml

@@ -7,6 +7,11 @@ paths:
     put:
       tags: [ai-resource]
       operationId: generateJobApplicationDraft
+      parameters:
+      - name: lang
+        in: query
+        required: true
+        schema: {type: string}
       requestBody:
         content:
           application/json:
@@ -18,10 +23,19 @@ paths:
           content:
             application/json:
               schema: {$ref: '#/components/schemas/AIJobDescriptionDTO'}
-  /api/ai/translateJobDescription:
+  /api/ai/translateJobDescriptionForJob:
     put:
       tags: [ai-resource]
-      operationId: translateText
+      operationId: translateJobDescriptionForJob
+      parameters:
+      - name: jobId
+        in: query
+        required: true
+        schema: {type: string}
+      - name: toLang
+        in: query
+        required: true
+        schema: {type: string}
       requestBody:
         content:
           application/json:
@@ -118,6 +132,30 @@ paths:
           content:
             application/json:
               schema: {$ref: '#/components/schemas/PageApplicationOverviewDTO'}
+  /api/applications/profile:
+    get:
+      tags: [application-resource]
+      operationId: getApplicantProfile
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema: {$ref: '#/components/schemas/ApplicantDTO'}
+    put:
+      tags: [application-resource]
+      operationId: updateApplicantProfile
+      requestBody:
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/ApplicantDTO'}
+        required: true
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema: {$ref: '#/components/schemas/ApplicantDTO'}
   /api/applications/rename-document/{documentDictionaryId}:
     put:
       tags: [application-resource]
@@ -2515,7 +2553,8 @@ components:
           enum: [FULLY_FUNDED, PARTIALLY_FUNDED, SCHOLARSHIP, SELF_FUNDED, INDUSTRY_SPONSORED,
             GOVERNMENT_FUNDED, RESEARCH_GRANT]
         image: {$ref: '#/components/schemas/Image'}
-        jobDescription: {type: string}
+        jobDescriptionDE: {type: string}
+        jobDescriptionEN: {type: string}
         jobId: {type: string, format: uuid}
         lastModifiedAt: {type: string, format: date-time}
         location:
@@ -2563,7 +2602,8 @@ components:
             GOVERNMENT_FUNDED, RESEARCH_GRANT]
         imageId: {type: string, format: uuid}
         imageUrl: {type: string}
-        jobDescription: {type: string}
+        jobDescriptionDE: {type: string}
+        jobDescriptionEN: {type: string}
         jobId: {type: string, format: uuid}
         location:
           type: string
@@ -2591,7 +2631,8 @@ components:
         endDate: {type: string, format: date}
         fieldOfStudies: {type: string}
         fundingType: {type: string}
-        jobDescription: {type: string}
+        jobDescriptionDE: {type: string}
+        jobDescriptionEN: {type: string}
         jobId: {type: string, format: uuid}
         lastModifiedAt: {type: string, format: date-time}
         location: {type: string}
@@ -2626,7 +2667,8 @@ components:
           enum: [FULLY_FUNDED, PARTIALLY_FUNDED, SCHOLARSHIP, SELF_FUNDED, INDUSTRY_SPONSORED,
             GOVERNMENT_FUNDED, RESEARCH_GRANT]
         imageId: {type: string, format: uuid}
-        jobDescription: {type: string}
+        jobDescriptionDE: {type: string}
+        jobDescriptionEN: {type: string}
         jobId: {type: string, format: uuid}
         location:
           type: string

src/main/java/de/tum/cit/aet/ai/exception/AiPromptException.java

@@ -3,6 +3,7 @@
 import de.tum.cit.aet.ai.dto.AIJobDescriptionDTO;
 import de.tum.cit.aet.ai.dto.AIJobDescriptionTranslationDTO;
 import de.tum.cit.aet.job.dto.JobFormDTO;
+import de.tum.cit.aet.job.service.JobService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,22 +22,36 @@ public class AiService {
 
     private final ChatClient chatClient;
 
-    public AiService(ChatClient.Builder chatClientBuilder) {
+    private final JobService jobService;
+
+    public AiService(ChatClient.Builder chatClientBuilder, JobService jobService) {
         this.chatClient = chatClientBuilder.build();
+        this.jobService = jobService;
     }
 
     /**
      * Generates a polished job application draft from the provided job form data.
      * The draft is generated using the configured ChatClient with AGG\-compliant,
      * gender\-inclusive language.
      *
-     * @param jobFormDTO the job form data containing description, requirements, and tasks
+     * @param jobFormDTO          the job form data containing description, requirements, and tasks
+     * @param descriptionLanguage the language for the generated job description
      * @return The generated job posting content
      */
-    public AIJobDescriptionDTO generateJobApplicationDraft(JobFormDTO jobFormDTO) {
+    public AIJobDescriptionDTO generateJobApplicationDraft(JobFormDTO jobFormDTO, String descriptionLanguage) {
+        String input = "de".equals(descriptionLanguage) ? jobFormDTO.jobDescriptionDE() : jobFormDTO.jobDescriptionEN();
+
         return chatClient
             .prompt()
-            .user(u -> u.text(jobGenerationResource).param("jobDescription", jobFormDTO.jobDescription()))
+            .user(u ->
+                u
+                    .text(jobGenerationResource)
+                    .param("jobDescription", input)
+                    .param("title", jobFormDTO.title() != null ? jobFormDTO.title() : "")
+                    .param("researchArea", jobFormDTO.researchArea() != null ? jobFormDTO.researchArea() : "")
+                    .param("fieldOfStudies", jobFormDTO.fieldOfStudies() != null ? jobFormDTO.fieldOfStudies() : "")
+                    .param("location", jobFormDTO.location() != null ? jobFormDTO.location().toString() : "")
+            )
             .call()
             .entity(AIJobDescriptionDTO.class);
     }
@@ -49,11 +64,29 @@ public AIJobDescriptionDTO generateJobApplicationDraft(JobFormDTO jobFormDTO) {
      * @param text the text to translate (German or English)
      * @return The translated text response with detected and target language info
      */
-    public AIJobDescriptionTranslationDTO translateText(String text) {
+    private AIJobDescriptionTranslationDTO translateText(String text, String toLang) {
         return chatClient
             .prompt()
-            .user(u -> u.text(translationResource).param("text", text))
+            .user(u -> u.text(translationResource).param("text", text).param("targetLanguage", toLang))
             .call()
             .entity(AIJobDescriptionTranslationDTO.class);
     }
+
+    /**
+     * Translates the provided job description text and persists the translated version
+     * in the job entity for the specified language.
+     *
+     * @param jobId  the ID of the job to update
+     * @param toLang the target language for translation ("de" or "en")
+     * @param text   the job description text to translate
+     * @return The translated text response with detected and target language info
+     */
+    public AIJobDescriptionTranslationDTO translateAndPersistJobDescription(String jobId, String toLang, String text) {
+        AIJobDescriptionTranslationDTO translated = translateText(text, toLang);
+        String translatedText = translated.translatedText();
+        if (translatedText != null && !translatedText.isBlank()) {
+            jobService.updateJobDescriptionLanguage(jobId, toLang, translatedText);
+        }
+        return translated;
+    }
 }

src/main/java/de/tum/cit/aet/ai/exception/AiResponseException.java

@@ -30,28 +30,38 @@ public AiResource(AiService aiService) {
     /**
      * Generate a job application draft from the provided structured job form.
      *
-     * @param jobForm the job form data used to build the AI prompt
+     * @param descriptionLanguage the language for the generated job description
+     * @param jobForm             the job form data used to build the AI prompt
      * @return a ResponseEntity containing the generated draft as JSON string
      */
     @ProfessorOrEmployeeOrAdmin
     @PutMapping(value = "generateJobDescription", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<AIJobDescriptionDTO> generateJobApplicationDraft(@RequestBody JobFormDTO jobForm) {
-        log.info("PUT /api/ai/generateJobDescription - Request received");
-        return ResponseEntity.ok(aiService.generateJobApplicationDraft(jobForm));
+    public ResponseEntity<AIJobDescriptionDTO> generateJobApplicationDraft(
+        @RequestBody JobFormDTO jobForm,
+        @RequestParam("lang") String descriptionLanguage
+    ) {
+        log.info("PUT /api/ai/generateJobDescription - Request received (lang={})", descriptionLanguage);
+        return ResponseEntity.ok(aiService.generateJobApplicationDraft(jobForm, descriptionLanguage));
     }
 
     /**
      * Translate text between German and English.
      * Automatically detects the source language and translates to the other language.
      * Preserves the original text structure and formatting.
      *
+     * @param jobId the ID of the job for which the description is being translated
+     * @param toLang the target language for translation ("de" or "en")
      * @param text the text to translate (German or English)
      * @return a ResponseEntity containing the translated text with language info
      */
     @ProfessorOrEmployeeOrAdmin
-    @PutMapping(value = "translateJobDescription", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<AIJobDescriptionTranslationDTO> translateText(@RequestBody String text) {
-        log.info("PUT /api/ai/translateJobDescription - Request received");
-        return ResponseEntity.ok(aiService.translateText(text));
+    @PutMapping(value = "translateJobDescriptionForJob", produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<AIJobDescriptionTranslationDTO> translateJobDescriptionForJob(
+        @RequestParam("jobId") String jobId,
+        @RequestParam("toLang") String toLang,
+        @RequestBody String text
+    ) {
+        log.info("PUT /api/ai/translateJobDescriptionForJob - Request received (jobId={}, toLang={})", jobId, toLang);
+        return ResponseEntity.ok(aiService.translateAndPersistJobDescription(jobId, toLang, text));
     }
 }

src/main/java/de/tum/cit/aet/ai/service/AiService.java

@@ -208,33 +208,7 @@ private void syncSnapshotDataToApplicant(Application application) {
         Applicant applicant = application.getApplicant();
         User user = applicant.getUser();
 
-        // Update user data
-        user.setFirstName(application.getApplicantFirstName());
-        user.setLastName(application.getApplicantLastName());
-        user.setGender(application.getApplicantGender());
-        user.setNationality(application.getApplicantNationality());
-        user.setBirthday(application.getApplicantBirthday());
-        user.setPhoneNumber(application.getApplicantPhoneNumber());
-        user.setWebsite(application.getApplicantWebsite());
-        user.setLinkedinUrl(application.getApplicantLinkedinUrl());
-        userRepository.save(user);
-
-        // Update applicant data
-        applicant.setStreet(application.getApplicantStreet());
-        applicant.setPostalCode(application.getApplicantPostalCode());
-        applicant.setCity(application.getApplicantCity());
-        applicant.setCountry(application.getApplicantCountry());
-        applicant.setBachelorDegreeName(application.getApplicantBachelorDegreeName());
-        applicant.setBachelorGradeUpperLimit(application.getApplicantBachelorGradeUpperLimit());
-        applicant.setBachelorGradeLowerLimit(application.getApplicantBachelorGradeLowerLimit());
-        applicant.setBachelorGrade(application.getApplicantBachelorGrade());
-        applicant.setBachelorUniversity(application.getApplicantBachelorUniversity());
-        applicant.setMasterDegreeName(application.getApplicantMasterDegreeName());
-        applicant.setMasterGradeUpperLimit(application.getApplicantMasterGradeUpperLimit());
-        applicant.setMasterGradeLowerLimit(application.getApplicantMasterGradeLowerLimit());
-        applicant.setMasterGrade(application.getApplicantMasterGrade());
-        applicant.setMasterUniversity(application.getApplicantMasterUniversity());
-        applicantRepository.save(applicant);
+        applyApplicantData(user, applicant, ApplicantDTO.getFromApplicationSnapshot(application));
     }
 
     private void confirmApplicationToApplicant(Application application) {
@@ -473,6 +447,53 @@ public void renameDocument(UUID documentId, String newName) {
         documentDictionaryService.renameDocument(documentId, newName);
     }
 
+    /**
+     * Retrieves the current user's applicant profile with all personal information.
+     * Creates an empty applicant profile if none exists yet.
+     *
+     * @return the ApplicantDTO with current user and applicant data
+     */
+    public ApplicantDTO getApplicantProfile() {
+        UUID userId = currentUserService.getUserId();
+        if (userId == null) {
+            throw new InvalidParameterException("UserId must not be null.");
+        }
+
+        Optional<Applicant> applicantOptional = applicantRepository.findById(userId);
+        Applicant applicant;
+        if (applicantOptional.isEmpty()) {
+            applicant = createApplicant(userId);
+        } else {
+            applicant = applicantOptional.get();
+        }
+
+        return ApplicantDTO.getFromEntity(applicant);
+    }
+
+    /**
+     * Updates the current user's applicant profile with personal information.
+     * Writes directly to `User` and `Applicant` entities.
+     *
+     * @param dto the updated applicant data
+     * @return the updated ApplicantDTO
+     */
+    @Transactional
+    public ApplicantDTO updateApplicantProfile(ApplicantDTO dto) {
+        UUID userId = currentUserService.getUserId();
+        if (userId == null) {
+            throw new InvalidParameterException("UserId must not be null.");
+        }
+
+        User user = userRepository.findById(userId).orElseThrow(() -> EntityNotFoundException.forId("User", userId));
+        Applicant applicant = applicantRepository.findById(userId).orElseGet(() -> createApplicant(userId));
+
+        applyApplicantData(user, applicant, dto);
+        userRepository.save(user);
+        applicantRepository.save(applicant);
+
+        return ApplicantDTO.getFromEntity(applicant);
+    }
+
     /**
      * Creates an Applicant for the given userId
      *
@@ -486,6 +507,42 @@ private Applicant createApplicant(UUID userId) {
         return applicantRepository.save(applicant);
     }
 
+    /**
+     * Applies applicant and user data from a DTO and persists both entities.
+     */
+    private void applyApplicantData(User user, Applicant applicant, ApplicantDTO dto) {
+        if (dto.user() != null) {
+            if (dto.user().firstName() != null) user.setFirstName(dto.user().firstName());
+            if (dto.user().lastName() != null) user.setLastName(dto.user().lastName());
+            if (dto.user().email() != null) user.setEmail(dto.user().email());
+            user.setGender(dto.user().gender());
+            user.setNationality(dto.user().nationality());
+            user.setBirthday(dto.user().birthday());
+            user.setPhoneNumber(dto.user().phoneNumber());
+            user.setWebsite(dto.user().website());
+            user.setLinkedinUrl(dto.user().linkedinUrl());
+        }
+
+        applicant.setStreet(dto.street());
+        applicant.setPostalCode(dto.postalCode());
+        applicant.setCity(dto.city());
+        applicant.setCountry(dto.country());
+
+        applicant.setBachelorDegreeName(dto.bachelorDegreeName());
+        applicant.setBachelorGradeUpperLimit(dto.bachelorGradeUpperLimit());
+        applicant.setBachelorGradeLowerLimit(dto.bachelorGradeLowerLimit());
+        applicant.setBachelorGrade(dto.bachelorGrade());
+        applicant.setBachelorUniversity(dto.bachelorUniversity());
+
+        applicant.setMasterDegreeName(dto.masterDegreeName());
+        applicant.setMasterGradeUpperLimit(dto.masterGradeUpperLimit());
+        applicant.setMasterGradeLowerLimit(dto.masterGradeLowerLimit());
+        applicant.setMasterGrade(dto.masterGrade());
+        applicant.setMasterUniversity(dto.masterUniversity());
+
+        // Save operations moved to updateApplicantProfile
+    }
+
     /**
      * Asserts that the current user can manage the application with the given ID.
      *