DEAR-115: add join team endpoint

database/01_init.sql

@@ -67,7 +67,8 @@ CREATE TABLE team_member
 
     CONSTRAINT pk_team_member PRIMARY KEY (id),
     CONSTRAINT fk_team_member_user FOREIGN KEY (user_id) REFERENCES users (id),
-    CONSTRAINT fk_team_member_team FOREIGN KEY (team_id) REFERENCES team (id)
+    CONSTRAINT fk_team_member_team FOREIGN KEY (team_id) REFERENCES team (id),
+    CONSTRAINT uq_team_member UNIQUE (user_id, team_id, role)
 );
 
 CREATE TABLE team_config

src/main/java/ch/fhnw/deardevbackend/controller/TeamController.java

@@ -1,25 +1,36 @@
 package ch.fhnw.deardevbackend.controller;
 
+import ch.fhnw.deardevbackend.controller.exceptions.ErrorResponse;
+import ch.fhnw.deardevbackend.controller.exceptions.YappiException;
 import ch.fhnw.deardevbackend.dto.CreateTeamDTO;
+import ch.fhnw.deardevbackend.dto.JoinTeamDTO;
 import ch.fhnw.deardevbackend.entities.Team;
 import ch.fhnw.deardevbackend.services.TeamService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("v1/")
+@RequestMapping("v1/team")
 public class TeamController {
 
     @Autowired
     private TeamService teamService;
 
-    @PostMapping("/team/create")
+    @PostMapping("/create")
     public ResponseEntity<Team> createTeam(@RequestBody CreateTeamDTO request) {
         Team createdTeam = teamService.createTeam(request);
         return ResponseEntity.ok().body(createdTeam);
     }
+
+    @PostMapping("/join")
+    public ResponseEntity<Team> joinTeam(@RequestBody JoinTeamDTO request) {
+        Team team = teamService.joinTeam(request);
+        return ResponseEntity.ok().body(team);
+    }
+
+    @ExceptionHandler(YappiException.class)
+    public ResponseEntity<ErrorResponse> handleYappiException(YappiException ex) {
+        return ResponseEntity.badRequest().body(new ErrorResponse(ex.getMessage()));
+    }
 }

src/main/java/ch/fhnw/deardevbackend/controller/exceptions/ErrorResponse.java

@@ -0,0 +1,10 @@
+package ch.fhnw.deardevbackend.controller.exceptions;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class ErrorResponse {
+    private String message;
+}

src/main/java/ch/fhnw/deardevbackend/controller/exceptions/YappiException.java

@@ -0,0 +1,12 @@
+package ch.fhnw.deardevbackend.controller.exceptions;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+public class YappiException extends RuntimeException {
+    private final String message;
+}

src/main/java/ch/fhnw/deardevbackend/dto/JoinTeamDTO.java

@@ -0,0 +1,9 @@
+package ch.fhnw.deardevbackend.dto;
+
+import lombok.Data;
+
+@Data
+public class JoinTeamDTO {
+    private String code;
+    private int userId;
+}

src/main/java/ch/fhnw/deardevbackend/repositories/TeamRepository.java

@@ -3,6 +3,11 @@
 import ch.fhnw.deardevbackend.entities.Team;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 public interface TeamRepository extends JpaRepository<Team, Integer> {
+
     boolean existsByCode(String code);
+
+    Optional<Team> findByCode(String code);
 }

src/main/java/ch/fhnw/deardevbackend/services/TeamService.java

@@ -1,6 +1,8 @@
 package ch.fhnw.deardevbackend.services;
 
+import ch.fhnw.deardevbackend.controller.exceptions.YappiException;
 import ch.fhnw.deardevbackend.dto.CreateTeamDTO;
+import ch.fhnw.deardevbackend.dto.JoinTeamDTO;
 import ch.fhnw.deardevbackend.entities.Role;
 import ch.fhnw.deardevbackend.entities.Team;
 import ch.fhnw.deardevbackend.entities.TeamMember;
@@ -10,6 +12,7 @@
 import ch.fhnw.deardevbackend.util.TeamCodeGenerator;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -44,6 +47,25 @@ public Team createTeam(CreateTeamDTO teamDTO) {
         return savedTeam;
     }
 
+    @Transactional
+    public Team joinTeam(JoinTeamDTO joinTeamDTO) {
+        Team team = teamRepository.findByCode(joinTeamDTO.getCode()).orElseThrow(() -> new YappiException("Team not found with code: " + joinTeamDTO.getCode()));
+
+        try {
+            TeamMember teamMember = TeamMember.builder()
+                    .userId(joinTeamDTO.getUserId())
+                    .teamId(team.getId())
+                    .role(Role.MEMBER)
+                    .active(true)
+                    .build();
+
+            teamMemberRepository.save(teamMember);
+        } catch (DataIntegrityViolationException ex) {
+            throw new YappiException("User with id: " + joinTeamDTO.getUserId() + " is already a member of the team with id: " + team.getId());
+        }
+        return team;
+    }
+
     private String generateUniqueTeamCode() {
         String code;
         do {