Development: Add research group info page

src/main/java/de/tum/cit/aet/core/util/PageUtil.java

@@ -26,7 +26,12 @@ public enum ColumnMapping {
         /**
          * Sortable columns used in job listings by professors.
          */
-        PROFESSOR_JOBS(Set.of("title", "state", "startDate", "createdAt", "lastModifiedAt"));
+        PROFESSOR_JOBS(Set.of("title", "state", "startDate", "createdAt", "lastModifiedAt")),
+
+        /**
+         * Sortable columns used in research group listings.
+         */
+        RESEARCH_GROUPS(Set.of("head", "name", "abbreviation", "email", "website", "school", "description", "defaultFieldOfStudies", "street", "postalCode", "city"));
 
         private final Set<String> sortableColumns;
 

src/main/java/de/tum/cit/aet/usermanagement/dto/ResearchGroupDTO.java

@@ -0,0 +1,54 @@
+package de.tum.cit.aet.usermanagement.dto;
+
+import de.tum.cit.aet.core.exception.EntityNotFoundException;
+import de.tum.cit.aet.usermanagement.domain.ResearchGroup;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+
+/**
+ * DTO for {@link ResearchGroup}
+ */
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record ResearchGroupDTO(
+    @NotBlank String name,
+    String abbreviation,
+    @NotBlank String head,
+    @Email String email,
+    String website,
+    String school,
+    String description,
+    String defaultFieldOfStudies,
+    String street,
+    String postalCode,
+    String city
+) {
+
+    /**
+     * @param researchGroup the ResearchGroup entity
+     * @return the ResearchGroupDTO from the entity
+     * @throws EntityNotFoundException if the ResearchGroup entity is null
+     */
+    public static ResearchGroupDTO getFromEntity(ResearchGroup researchGroup) {
+        if (researchGroup == null) {
+            throw new EntityNotFoundException("ResearchGroup entity should not be null");
+        }
+
+        return new ResearchGroupDTO(
+            researchGroup.getName(),
+            researchGroup.getAbbreviation(),
+            researchGroup.getHead(),
+            researchGroup.getEmail(),
+            researchGroup.getWebsite(),
+            researchGroup.getSchool(),
+            researchGroup.getDescription(),
+            researchGroup.getDefaultFieldOfStudies(),
+            researchGroup.getStreet(),
+            researchGroup.getPostalCode(),
+            researchGroup.getCity()
+        );
+    }
+
+}

src/main/java/de/tum/cit/aet/usermanagement/service/ResearchGroupService.java

@@ -1,21 +1,41 @@
 package de.tum.cit.aet.usermanagement.service;
 
+import java.util.UUID;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
+import de.tum.cit.aet.core.dto.PageDTO;
+import de.tum.cit.aet.core.dto.PageResponseDTO;
 import de.tum.cit.aet.core.exception.EntityNotFoundException;
 import de.tum.cit.aet.usermanagement.domain.ResearchGroup;
+import de.tum.cit.aet.usermanagement.dto.ResearchGroupDTO;
 import de.tum.cit.aet.usermanagement.dto.ResearchGroupLargeDTO;
 import de.tum.cit.aet.usermanagement.repository.ResearchGroupRepository;
-import java.util.UUID;
+import lombok.RequiredArgsConstructor;
 
+/**
+ * Service for managing research groups.
+ */
 @Service
+@RequiredArgsConstructor
 public class ResearchGroupService {
 
     private final ResearchGroupRepository researchGroupRepository;
 
-    public ResearchGroupService(
-            ResearchGroupRepository researchGroupRepository) {
-        this.researchGroupRepository = researchGroupRepository;
+    /**
+     * Retrieves a research group by its ID.
+     *
+     * @param researchGroupId the ID of the research group
+     * @return the research group DTO
+     * @throws EntityNotFoundException if the research group is not found
+     */
+    public ResearchGroupDTO getResearchGroup(UUID researchGroupId) {
+        ResearchGroup researchGroup = researchGroupRepository.findByIdElseThrow(researchGroupId);
+        return ResearchGroupDTO.getFromEntity(researchGroup);
     }
 
     /**
@@ -36,7 +56,50 @@ public ResearchGroupLargeDTO getResearchGroupDetails(UUID researchGroupId) {
                 researchGroup.getStreet(),
                 researchGroup.getPostalCode(),
                 researchGroup.getCity());
+    }
 
+    /**
+     * Retrieves all research groups.
+     *
+     * @param pageDTO the pagination parameters
+     * @return list of all research group DTOs
+     */
+    public PageResponseDTO<ResearchGroupDTO> getAllResearchGroups(PageDTO pageDTO) {
+        Pageable pageable = PageRequest.of(pageDTO.pageNumber(), pageDTO.pageSize(), Sort.by(Sort.Direction.ASC, "name"));
+        Page<ResearchGroup> page = researchGroupRepository.findAll(pageable);
+        return new PageResponseDTO<>(page.get().map(ResearchGroupDTO::getFromEntity).toList(), page.getTotalElements());
     }
 
+    /**
+     * Updates an existing research group.
+     *
+     * @param researchGroupId  the ID of the research group to update
+     * @param researchGroupDTO the research group data to update
+     * @return the updated research group DTO
+     * @throws EntityNotFoundException if the research group is not found
+     */
+    public ResearchGroupDTO updateResearchGroup(UUID researchGroupId, ResearchGroupDTO researchGroupDTO) {
+        ResearchGroup researchGroup = researchGroupRepository.findByIdElseThrow(researchGroupId);
+        updateEntityFromDTO(researchGroup, researchGroupDTO);
+
+        ResearchGroup updatedResearchGroup = researchGroupRepository.save(researchGroup);
+        return ResearchGroupDTO.getFromEntity(updatedResearchGroup);
+    }
+
+    /**
+     * Updates a ResearchGroup entity with values from the provided DTO.
+     */
+    private void updateEntityFromDTO(ResearchGroup entity, ResearchGroupDTO dto) {
+        entity.setName(dto.name());
+        entity.setAbbreviation(dto.abbreviation());
+        entity.setHead(dto.head());
+        entity.setEmail(dto.email());
+        entity.setWebsite(dto.website());
+        entity.setSchool(dto.school());
+        entity.setDescription(dto.description());
+        entity.setStreet(dto.street());
+        entity.setPostalCode(dto.postalCode());
+        entity.setCity(dto.city());
+        entity.setDefaultFieldOfStudies(dto.defaultFieldOfStudies());
+    }
 }

src/main/java/de/tum/cit/aet/usermanagement/web/ResearchGroupResource.java

@@ -1,28 +1,78 @@
 package de.tum.cit.aet.usermanagement.web;
 
+import de.tum.cit.aet.core.dto.PageDTO;
+import de.tum.cit.aet.core.dto.PageResponseDTO;
+import de.tum.cit.aet.core.security.CheckAccess;
+import de.tum.cit.aet.usermanagement.dto.ResearchGroupDTO;
+import de.tum.cit.aet.usermanagement.dto.ResearchGroupLargeDTO;
+import de.tum.cit.aet.usermanagement.service.ResearchGroupService;
 import java.util.UUID;
+import lombok.RequiredArgsConstructor;
 
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import de.tum.cit.aet.usermanagement.dto.ResearchGroupLargeDTO;
-import de.tum.cit.aet.usermanagement.service.ResearchGroupService;
+import jakarta.validation.Valid;
+import org.springframework.web.bind.annotation.*;
 
+/**
+ * REST controller for managing research groups.
+ */
 @RestController
 @RequestMapping("/api/research-groups")
+@RequiredArgsConstructor
 public class ResearchGroupResource {
 
-    final ResearchGroupService researchGroupService;
+    private final ResearchGroupService researchGroupService;
 
-    public ResearchGroupResource(ResearchGroupService researchGroupService) {
-        this.researchGroupService = researchGroupService;
+    /**
+     * Get all research groups.
+     *
+     * @param pageDTO the pagination parameters
+     * @return the list of research groups
+     */
+    @GetMapping
+    public ResponseEntity<PageResponseDTO<ResearchGroupDTO>> getAllResearchGroups(@ParameterObject @Valid @ModelAttribute PageDTO pageDTO) {
+        PageResponseDTO<ResearchGroupDTO> researchGroups = researchGroupService.getAllResearchGroups(pageDTO);
+        return ResponseEntity.ok(researchGroups);
     }
 
+    /**
+     * Get a specific research group by ID.
+     *
+     * @param id the ID of the research group to retrieve
+     * @return the research group
+     */
+    @GetMapping("/{id}")
+    public ResponseEntity<ResearchGroupDTO> getResearchGroup(@PathVariable UUID id) {
+        ResearchGroupDTO researchGroup = researchGroupService.getResearchGroup(id);
+        return ResponseEntity.ok(researchGroup);
+    }
+
+    /**
+     * Get detailed information about a research group.
+     *
+     * @param researchGroupId the ID of the research group to get details for
+     * @return the detailed research group information
+     */
     @GetMapping("/detail/{researchGroupId}")
     public ResponseEntity<ResearchGroupLargeDTO> getResourceGroupDetails(@PathVariable UUID researchGroupId) {
         return ResponseEntity.ok(researchGroupService.getResearchGroupDetails(researchGroupId));
     }
+
+    /**
+     * Update a research group.
+     *
+     * @param id the ID of the research group to update
+     * @param researchGroupDTO the research group data to update
+     * @return the updated research group
+     */
+    @PutMapping("/{id}")
+    @CheckAccess
+    public ResponseEntity<ResearchGroupDTO> updateResearchGroup(
+        @PathVariable UUID id,
+        @Valid @RequestBody ResearchGroupDTO researchGroupDTO
+    ) {
+        ResearchGroupDTO updatedResearchGroup = researchGroupService.updateResearchGroup(id, researchGroupDTO);
+        return ResponseEntity.ok(updatedResearchGroup);
+    }
 }

src/main/webapp/app/app.routes.ts

@@ -233,6 +233,14 @@ const routes: Routes = [
         m => m.ResearchGroupTemplateEdit,
       ),
   },
+  {
+    path: 'research-group/info',
+    canActivate: [UserRouteAccessService],
+    data: { authorities: [UserShortDTO.RolesEnum.Professor] },
+    loadComponent: () =>
+      import('./usermanagement/research-group/research-group-info/research-group-info.component').then(m => m.ResearchGroupInfoComponent),
+    title: 'researchGroup.groupInfoPage',
+  },
 
   // ======================================================================================
   // Error Handling

src/main/webapp/app/generated/.openapi-generator/FILES

@@ -2,6 +2,7 @@
 README.md
 api.base.service.ts
 api.module.ts
+api/actuator.service.ts
 api/api.ts
 api/applicationEvaluationResource.service.ts
 api/applicationResource.service.ts
@@ -52,6 +53,7 @@ model/jobDTO.ts
 model/jobDetailDTO.ts
 model/jobFilterOptionDTO.ts
 model/jobFormDTO.ts
+model/link.ts
 model/loginRequestDTO.ts
 model/models.ts
 model/pageCreatedJobDTO.ts
@@ -63,6 +65,7 @@ model/ratingDTO.ts
 model/ratingOverviewDTO.ts
 model/rejectDTO.ts
 model/researchGroup.ts
+model/researchGroupDTO.ts
 model/researchGroupLargeDTO.ts
 model/researchGroupShortDTO.ts
 model/sendCodeRequest.ts