fix(teams): trim team names on xls import and allow deleting teams linked to injects (#7558)

openaev-api/src/main/java/io/openaev/rest/team/TeamApi.java

@@ -244,11 +244,13 @@ public Team upsertTeam(@Valid @RequestBody TeamCreateInput input) {
   @Transactional
   public void deleteTeam(@PathVariable @Schema(description = "ID of the team") String teamId)
       throws ResourceInUseException {
-    if (!teamRepository.existsByIdAndTenantId(teamId, TenantContext.getCurrentTenant())) {
-      throw new ElementNotFoundException();
-    }
+    Team team =
+        teamRepository
+            .findByIdAndTenantId(teamId, TenantContext.getCurrentTenant())
+            .orElseThrow(ElementNotFoundException::new);
     try {
-      teamRepository.deleteById(teamId);
+      team.getInjects().forEach(inject -> inject.getTeams().remove(team));
+      teamRepository.delete(team);
     } catch (InvalidDataAccessApiUsageException | TransientObjectException ex) {
       throw new ResourceInUseException(
           "Cannot delete this team because it is still in use. Please remove its dependencies first.",

openaev-api/src/main/java/io/openaev/service/InjectImportService.java

@@ -888,6 +888,8 @@ private List<ImportMessage> addFields(
                           .map(column -> InjectImportUtils.getValueAsString(row, column))
                           .collect(Collectors.joining(","))
                           .split(","))
+                  .map(String::trim)
+                  .filter(value -> !value.isBlank())
                   .toList();
         }
         if (columnValues.isEmpty() || columnValues.stream().allMatch(String::isEmpty)) {

openaev-api/src/test/java/io/openaev/service/InjectImportServiceTest.java

@@ -13,16 +13,16 @@
 import io.openaev.database.repository.ScenarioRepository;
 import io.openaev.rest.exception.ElementNotFoundException;
 import io.openaev.utils.InjectImportUtils;
+import io.openaev.utils.fixtures.XlsFixture;
 import io.openaev.utils.mockMapper.MockMapperUtils;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.Temporal;
-import java.util.Date;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -235,6 +235,33 @@ void testExtractWithoutConvertingCellAsHTML() {
     assertEquals("Test\nTest", result);
   }
 
+  @DisplayName("Test parse teams cell with spaces and trailing comma")
+  @Test
+  void testParseTeamsCellWithSpacesAndTrailingComma() {
+    // -- PREPARE --
+    XlsFixture lsFixture = new XlsFixture();
+    workbook = lsFixture.createXlsFileWithTeams("Team A,\n Team A , Team_B,");
+    Sheet sheet = workbook.getSheetAt(0);
+    row = sheet.getRow(0);
+    RuleAttribute ruleAttribute = MockMapperUtils.createRuleAttribute();
+    ruleAttribute.setColumns("A");
+
+    // -- EXECUTE --
+    List<String> columnValues =
+        Arrays.stream(
+                Arrays.stream(ruleAttribute.getColumns().split("\\+"))
+                    .map(column -> InjectImportUtils.getValueAsString(row, column))
+                    .collect(Collectors.joining(","))
+                    .split(","))
+            .map(String::trim)
+            .filter(value -> !value.isBlank())
+            .distinct()
+            .toList();
+
+    // -- ASSERT --
+    assertEquals(List.of("Team A", "Team_B"), columnValues);
+  }
+
   @DisplayName("Test get inject date without pattern but with an ISO_DATE_TIME format")
   @Test
   void testGetInjectDateWithoutPattern() {

openaev-api/src/test/java/io/openaev/utils/fixtures/XlsFixture.java

@@ -40,4 +40,12 @@ public static String createDefaultXlsFile() throws IOException {
     xlsFile.toFile().deleteOnExit();
     return importId;
   }
+
+  public Workbook createXlsFileWithTeams(String teamsCellValue) {
+    Workbook wb = new XSSFWorkbook();
+    Sheet sheet = wb.createSheet(DEFAULT_SHEET_NAME);
+    Row dataRow = sheet.createRow(0);
+    dataRow.createCell(0).setCellValue(teamsCellValue);
+    return wb;
+  }
 }