From 2060f94d791a6557ccd896df1add06d6234be72c Mon Sep 17 00:00:00 2001 From: agoer <alexander.goerlitz@student.reutlingen-university.de> Date: Sat, 22 Jun 2024 11:15:36 +0200 Subject: [PATCH] Updated tests --- opp/core/src/main/java/Repository.java | 2 +- opp/core/src/main/java/TeamMemberImpl.java | 6 ++++-- .../src/main/java/JDBCRepository.java | 3 ++- opp/jdbc-repo-impl/src/test/java/Tests.java | 13 ++++++++++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/opp/core/src/main/java/Repository.java b/opp/core/src/main/java/Repository.java index 92d4df3..6b2355c 100644 --- a/opp/core/src/main/java/Repository.java +++ b/opp/core/src/main/java/Repository.java @@ -94,7 +94,7 @@ public interface Repository { Id<TeamMember> teamMemberId(); - void saveTeamMember(TeamMember TeamMember) throws Exception; + TeamMember saveTeamMember(TeamMember TeamMember) throws Exception; TeamMember removeTeamMember(Id<OperationTeam> operationTeamId, Id<OPStaff> opStaffId) throws Exception; diff --git a/opp/core/src/main/java/TeamMemberImpl.java b/opp/core/src/main/java/TeamMemberImpl.java index a79d1e8..9ed4911 100644 --- a/opp/core/src/main/java/TeamMemberImpl.java +++ b/opp/core/src/main/java/TeamMemberImpl.java @@ -21,16 +21,18 @@ public class TeamMemberImpl implements TeamMemberService{ return repo.getOperationTeamOPStaffImpl(operationTeamId); } - private TeamMember assignStaffimpl(TeamMember.AssignStaff as) { + private TeamMember assignStaffimpl(TeamMember.AssignStaff as) throws Exception { TeamMember teammember = new TeamMember( as.operationTeamId(), as.opStaffId(), Instant.now() ); - return teammember; + return repo.saveTeamMember(teammember); } + + private TeamMember removeStaffimpl(TeamMember.RemoveStaff rs) throws Exception { return repo.removeTeamMember(rs.operationTeamId(), rs.opStaffId()); diff --git a/opp/jdbc-repo-impl/src/main/java/JDBCRepository.java b/opp/jdbc-repo-impl/src/main/java/JDBCRepository.java index 141f09d..a54de5c 100644 --- a/opp/jdbc-repo-impl/src/main/java/JDBCRepository.java +++ b/opp/jdbc-repo-impl/src/main/java/JDBCRepository.java @@ -640,7 +640,7 @@ class JDBCRepository implements Repository return new Id<TeamMember>(randomUUID().toString()); //TODO findOperation(id).isEmpty() ? id : operationId(); } - public void saveTeamMember(TeamMember TeamMember) throws Exception{ + public TeamMember saveTeamMember(TeamMember TeamMember) throws Exception{ try( var stmt = conn.createStatement() @@ -657,6 +657,7 @@ class JDBCRepository implements Repository }catch(SQLException e){ throw new RuntimeException(e); } + return TeamMember; } public TeamMember removeTeamMember(Id<OperationTeam> operationTeamId, Id<OPStaff> opStaffId) throws Exception{ diff --git a/opp/jdbc-repo-impl/src/test/java/Tests.java b/opp/jdbc-repo-impl/src/test/java/Tests.java index 2b7a14d..5917442 100644 --- a/opp/jdbc-repo-impl/src/test/java/Tests.java +++ b/opp/jdbc-repo-impl/src/test/java/Tests.java @@ -333,14 +333,21 @@ public final class Tests OperationTeam deleteOperationTeam = operationTeamService.process(deleteCommand); } - //@Test + @Test public void testInsertTeamMember1() throws Exception{ - try { + TeamMember.AssignStaff assignCommand = new TeamMember.AssignStaff( + new Id<OperationTeam>("31"), + new Id<OPStaff>("4444") + ); + + TeamMember assignStaff = teamMemberService.process(assignCommand); + + /*try { repo.saveTeamMember(testTeamMember); } catch (Exception e){ e.printStackTrace(); - } + }*/ } //@Test -- GitLab