Merge origin/main into fix-pair-programming

Resolve conflicts in Teams.tsx: keep PP merge logic in onGitDone
and adopt main's templateAuthors accumulation pattern.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: az108

openapi/openapi.yaml

@@ -292,7 +292,7 @@ paths:
   /api/exercises/{exerciseId}/email-mappings/template-author:
     get:
       tags: [email-mapping-resource]
-      operationId: getTemplateAuthor
+      operationId: getTemplateAuthors
       parameters:
       - name: exerciseId
         in: path
@@ -303,10 +303,12 @@ paths:
           description: OK
           content:
             application/json:
-              schema: {$ref: '#/components/schemas/TemplateAuthorDTO'}
+              schema:
+                type: array
+                items: {$ref: '#/components/schemas/TemplateAuthorDTO'}
     put:
       tags: [email-mapping-resource]
-      operationId: setTemplateAuthor
+      operationId: setTemplateAuthors
       parameters:
       - name: exerciseId
         in: path
@@ -315,7 +317,9 @@ paths:
       requestBody:
         content:
           application/json:
-            schema: {$ref: '#/components/schemas/TemplateAuthorDTO'}
+            schema:
+              type: array
+              items: {$ref: '#/components/schemas/TemplateAuthorDTO'}
         required: true
       responses:
         '200':
@@ -327,7 +331,7 @@ paths:
                 items: {$ref: '#/components/schemas/ClientResponseDTO'}
     delete:
       tags: [email-mapping-resource]
-      operationId: deleteTemplateAuthor
+      operationId: deleteTemplateAuthors
       parameters:
       - name: exerciseId
         in: path

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

@@ -51,41 +51,19 @@ public class ContributionFairnessService {
      * @return fairness report
      */
     public FairnessReportDTO analyzeFairness(TeamRepositoryDTO repositoryDTO) {
-        return analyzeFairnessWithUsage(repositoryDTO).report();
-    }
-
-    /**
-     * Analyses a repository and returns both fairness report and LLM token totals.
-     *
-     * @param repositoryDTO the repository to analyse
-     * @return fairness report plus token usage
-     */
-    public FairnessReportWithUsageDTO analyzeFairnessWithUsage(TeamRepositoryDTO repositoryDTO) {
-        return analyzeFairnessWithUsage(repositoryDTO, null, null);
-    }
-
-    /**
-     * Analyses a repository with optional template author exclusion (default weights).
-     *
-     * @param repositoryDTO       the repository to analyse
-     * @param templateAuthorEmail email of the template author to exclude (lowercase), or {@code null}
-     * @return fairness report plus token usage
-     */
-    public FairnessReportWithUsageDTO analyzeFairnessWithUsage(TeamRepositoryDTO repositoryDTO,
-            String templateAuthorEmail) {
-        return analyzeFairnessWithUsage(repositoryDTO, templateAuthorEmail, null);
+        return analyzeFairnessWithUsage(repositoryDTO, null, null).report();
     }
 
     /**
      * Analyses a repository with optional template author exclusion.
      *
-     * @param repositoryDTO       the repository to analyse
-     * @param templateAuthorEmail email of the template author to exclude (lowercase), or {@code null}
-     * @param exerciseId          the exercise ID for per-exercise CQI weight resolution
+     * @param repositoryDTO        the repository to analyse
+     * @param templateAuthorEmails emails of the template authors to exclude (lowercase), or {@code null}
+     * @param exerciseId           the exercise ID for per-exercise CQI weight resolution
      * @return fairness report plus token usage
      */
     public FairnessReportWithUsageDTO analyzeFairnessWithUsage(TeamRepositoryDTO repositoryDTO,
-            String templateAuthorEmail, Long exerciseId) {
+            Set<String> templateAuthorEmails, Long exerciseId) {
         String repoPath = repositoryDTO.localPath();
         String teamName = repositoryDTO.participation().team().name();
         String shortName = repositoryDTO.participation().team().shortName();
@@ -103,7 +81,7 @@ public FairnessReportWithUsageDTO analyzeFairnessWithUsage(TeamRepositoryDTO rep
 
         try {
             // 1) Map commits to authors using full git history walk
-            AuthorMappingResult authorMapping = mapCommitsToAuthors(repositoryDTO, templateAuthorEmail);
+            AuthorMappingResult authorMapping = mapCommitsToAuthors(repositoryDTO, templateAuthorEmails);
 
             if (authorMapping.teamMemberCommits.isEmpty()) {
                 return new FairnessReportWithUsageDTO(
@@ -207,10 +185,10 @@ private record AuthorMappingResult(
      * and assigns synthetic negative IDs for external contributors (grouped by email).
      */
     private AuthorMappingResult mapCommitsToAuthors(TeamRepositoryDTO repositoryDTO,
-            String templateAuthorEmail) {
+            Set<String> templateAuthorEmails) {
         // 1) Delegate commit mapping to analysis service (single git walk)
         CommitMappingResultDTO mapping = gitContributionAnalysisService.mapCommitToAuthor(
-                repositoryDTO, templateAuthorEmail);
+                repositoryDTO, templateAuthorEmails);
 
         // 2) Filter assigned commits to team members only
         Set<Long> teamMemberIds = new HashSet<>();

src/main/java/de/tum/cit/aet/analysis/domain/ExerciseTemplateAuthor.java

@@ -22,7 +22,7 @@ public class ExerciseTemplateAuthor {
     @GeneratedValue(strategy = GenerationType.UUID)
     private UUID id;
 
-    @Column(name = "exercise_id", nullable = false, unique = true)
+    @Column(name = "exercise_id", nullable = false)
     private Long exerciseId;
 
     @Column(name = "template_email", nullable = false)

src/main/java/de/tum/cit/aet/analysis/repository/ExerciseTemplateAuthorRepository.java

@@ -6,13 +6,13 @@
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Optional;
+import java.util.List;
 import java.util.UUID;
 
 @Repository
 public interface ExerciseTemplateAuthorRepository extends JpaRepository<ExerciseTemplateAuthor, UUID> {
 
-    Optional<ExerciseTemplateAuthor> findByExerciseId(Long exerciseId);
+    List<ExerciseTemplateAuthor> findByExerciseId(Long exerciseId);
 
     @Modifying
     @Transactional

src/main/java/de/tum/cit/aet/analysis/service/AnalysisResultPersistenceService.java

@@ -11,7 +11,6 @@
 import de.tum.cit.aet.ai.service.ContributionFairnessService;
 import de.tum.cit.aet.analysis.domain.AnalyzedChunk;
 import de.tum.cit.aet.analysis.domain.ExerciseEmailMapping;
-import de.tum.cit.aet.analysis.domain.ExerciseTemplateAuthor;
 import de.tum.cit.aet.analysis.dto.AuthorContributionDTO;
 import de.tum.cit.aet.analysis.dto.OrphanCommitDTO;
 import de.tum.cit.aet.analysis.dto.RepositoryAnalysisResultDTO;
@@ -33,19 +32,15 @@
 import de.tum.cit.aet.repositoryProcessing.repository.StudentRepository;
 import de.tum.cit.aet.repositoryProcessing.repository.TeamParticipationRepository;
 import de.tum.cit.aet.repositoryProcessing.repository.TeamRepositoryRepository;
-import de.tum.cit.aet.repositoryProcessing.repository.TutorRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Persists Phase-2 (git analysis) and Phase-3 (AI analysis) results.
@@ -68,7 +63,6 @@ public class AnalysisResultPersistenceService {
 
     private final TeamRepositoryRepository teamRepositoryRepository;
     private final TeamParticipationRepository teamParticipationRepository;
-    private final TutorRepository tutorRepository;
     private final StudentRepository studentRepository;
     private final AnalyzedChunkRepository analyzedChunkRepository;
     private final ExerciseTemplateAuthorRepository templateAuthorRepository;
@@ -94,7 +88,6 @@ public AnalysisResultPersistenceService(
             PairProgrammingService pairProgrammingService,
             TeamRepositoryRepository teamRepositoryRepository,
             TeamParticipationRepository teamParticipationRepository,
-            TutorRepository tutorRepository,
             StudentRepository studentRepository,
             AnalyzedChunkRepository analyzedChunkRepository,
             ExerciseTemplateAuthorRepository templateAuthorRepository,
@@ -113,7 +106,6 @@ public AnalysisResultPersistenceService(
         this.pairProgrammingService = pairProgrammingService;
         this.teamRepositoryRepository = teamRepositoryRepository;
         this.teamParticipationRepository = teamParticipationRepository;
-        this.tutorRepository = tutorRepository;
         this.studentRepository = studentRepository;
         this.analyzedChunkRepository = analyzedChunkRepository;
         this.templateAuthorRepository = templateAuthorRepository;
@@ -256,9 +248,10 @@ public ClientResponseWithUsage saveAIAnalysisResultWithUsage(TeamRepositoryDTO r
         teamParticipationRepository.save(teamParticipation);
 
         List<Student> students = studentRepository.findAllByTeam(teamParticipation);
-        String templateAuthorEmail = templateAuthorRepository.findByExerciseId(exerciseId)
-                .map(ExerciseTemplateAuthor::getTemplateEmail)
-                .orElse(null);
+        Set<String> templateAuthorEmails = templateAuthorRepository.findByExerciseId(exerciseId)
+                .stream()
+                .map(ta -> ta.getTemplateEmail().toLowerCase(Locale.ROOT))
+                .collect(Collectors.toSet());
 
         Double cqi = null;
         boolean isSuspicious = false;
@@ -270,7 +263,7 @@ public ClientResponseWithUsage saveAIAnalysisResultWithUsage(TeamRepositoryDTO r
         // 1) Detect orphan commits
         try {
             RepositoryAnalysisResultDTO analysisResult = gitContributionAnalysisService
-                    .analyzeRepositoryWithOrphans(repo, templateAuthorEmail);
+                    .analyzeRepositoryWithOrphans(repo, templateAuthorEmails);
             orphanCommits = analysisResult.orphanCommits();
         } catch (Exception e) {
             log.warn("Failed to detect orphan commits for team {}: {}", team.name(), e.getMessage());
@@ -280,7 +273,7 @@ public ClientResponseWithUsage saveAIAnalysisResultWithUsage(TeamRepositoryDTO r
         boolean fairnessSucceeded = false;
         try {
             FairnessReportWithUsageDTO fairnessResult = fairnessService.analyzeFairnessWithUsage(
-                    repo, templateAuthorEmail);
+                    repo, templateAuthorEmails, null);
             FairnessReportDTO report = fairnessResult.report();
             teamTokenTotals = fairnessResult.tokenTotals();
 
@@ -541,11 +534,11 @@ public void applyExistingEmailMappings(TeamParticipation participation, Long exe
             Map<String, List<AnalyzedChunk>> remappedByStudent = new HashMap<>();
 
             for (ExerciseEmailMapping mapping : mappings) {
-                String emailLower = mapping.getGitEmail().toLowerCase(java.util.Locale.ROOT);
+                String emailLower = mapping.getGitEmail().toLowerCase(Locale.ROOT);
                 for (AnalyzedChunk chunk : chunks) {
                     if (Boolean.TRUE.equals(chunk.getIsExternalContributor())
                             && emailLower.equals(chunk.getAuthorEmail() != null
-                                    ? chunk.getAuthorEmail().toLowerCase(java.util.Locale.ROOT) : null)) {
+                            ? chunk.getAuthorEmail().toLowerCase(Locale.ROOT) : null)) {
                         chunk.setIsExternalContributor(false);
                         chunk.setAuthorName(mapping.getStudentName());
                         remappedByStudent.computeIfAbsent(mapping.getStudentName(), k -> new ArrayList<>())
@@ -587,6 +580,27 @@ public void applyExistingEmailMappings(TeamParticipation participation, Long exe
                     }
                 }
                 cqiRecalculationService.recalculateFromChunks(participation, chunks);
+
+                // Recompute orphan commit count from remaining external-contributor chunks,
+                // but exclude template authors (they should not be considered "unmatched")
+                Set<String> templateAuthorEmails = templateAuthorRepository.findByExerciseId(exerciseId)
+                        .stream().map(ta -> ta.getTemplateEmail().toLowerCase(Locale.ROOT)).collect(Collectors.toSet());
+                int remainingOrphanCommits = 0;
+                for (AnalyzedChunk c : chunks) {
+                    if (Boolean.TRUE.equals(c.getIsExternalContributor())) {
+                        String chunkEmail = c.getAuthorEmail() != null ? c.getAuthorEmail().toLowerCase(Locale.ROOT) : null;
+                        if (chunkEmail != null && templateAuthorEmails.contains(chunkEmail)) {
+                            // skip template authors
+                            continue;
+                        }
+                        if (c.getCommitShas() != null && !c.getCommitShas().isEmpty()) {
+                            remainingOrphanCommits += c.getCommitShas().split(",").length;
+                        }
+                    }
+                }
+                participation.setOrphanCommitCount(remainingOrphanCommits);
+                // persist updated participation so UI queries see new value
+                teamParticipationRepository.save(participation);
             }
         } catch (Exception e) {
             log.warn("Failed to apply existing email mappings for team {}: {}",
@@ -630,24 +644,6 @@ public String serializeCommitMessages(List<String> messages) {
         }
     }
 
-    /**
-     * Serializes a weekly effort distribution to a JSON string.
-     *
-     * @param weeklyDistribution the weekly effort values
-     * @return JSON array string, or {@code null} if empty or on error
-     */
-    public String serializeWeeklyDistribution(List<Double> weeklyDistribution) {
-        try {
-            if (weeklyDistribution == null || weeklyDistribution.isEmpty()) {
-                return null;
-            }
-            return objectMapper.writeValueAsString(weeklyDistribution);
-        } catch (Exception e) {
-            log.warn("Failed to serialize weekly distribution: {}", e.getMessage());
-            return null;
-        }
-    }
-
     // =====================================================================
     //  Internal helpers
     // =====================================================================