From 6ddb338f7131e77d96c00f9068ce61dfbdda63b7 Mon Sep 17 00:00:00 2001
From: agoer <alexander.goerlitz@student.reutlingen-university.de>
Date: Fri, 21 Jun 2024 21:06:49 +0200
Subject: [PATCH] Updated Table opStaffsinOperationTeams: removed Primary and
set the Foreign Keys opstaffsId and operationteamId as the Primary Key.
Updated the assignStaff method.
---
opp/core/src/main/java/TeamMember.java | 2 --
opp/core/src/main/java/TeamMemberImpl.java | 2 --
opp/jdbc-repo-impl/src/main/java/JDBCRepository.java | 10 +++++-----
opp/jdbc-repo-impl/src/test/java/Tests.java | 7 +++----
4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opp/core/src/main/java/TeamMember.java b/opp/core/src/main/java/TeamMember.java
index 6d6064f..7525550 100644
--- a/opp/core/src/main/java/TeamMember.java
+++ b/opp/core/src/main/java/TeamMember.java
@@ -2,8 +2,6 @@ import java.time.Instant;
public record TeamMember(
- Id<TeamMember> teamMemberId,
-
Id<OperationTeam> operationTeamId,
Id<OPStaff> opStaffId,
diff --git a/opp/core/src/main/java/TeamMemberImpl.java b/opp/core/src/main/java/TeamMemberImpl.java
index 2f4a271..418bc31 100644
--- a/opp/core/src/main/java/TeamMemberImpl.java
+++ b/opp/core/src/main/java/TeamMemberImpl.java
@@ -24,7 +24,6 @@ public class TeamMemberImpl implements TeamMemberService{
private TeamMember assignStaffimpl(TeamMember.AssignStaff as) {
TeamMember teammember =
new TeamMember(
- repo.teamMemberId(),
as.operationTeamId(),
as.opStaffId(),
Instant.now()
@@ -35,7 +34,6 @@ public class TeamMemberImpl implements TeamMemberService{
private TeamMember removeStaffimpl(TeamMember.RemoveStaff rs) {
TeamMember teammember =
new TeamMember(
- repo.teamMemberId(),
rs.operationTeamId(),
rs.opStaffId(),
Instant.now()
diff --git a/opp/jdbc-repo-impl/src/main/java/JDBCRepository.java b/opp/jdbc-repo-impl/src/main/java/JDBCRepository.java
index 3f1e9b2..890f49f 100644
--- a/opp/jdbc-repo-impl/src/main/java/JDBCRepository.java
+++ b/opp/jdbc-repo-impl/src/main/java/JDBCRepository.java
@@ -89,12 +89,12 @@ class JDBCRepository implements Repository
*/
private static final String CREATE_OP_STAFF_IN_OPERATION_TEAM_TABLE = """
CREATE TABLE IF NOT EXISTS opStaffsInOperationTeams(
- id VARCHAR(50) PRIMARY KEY,
operationTeamId VARCHAR(50),
opStaffId VARCHAR(50),
lastUpdate TIMESTAMP NOT NULL,
FOREIGN KEY (operationTeamId) REFERENCES operationTeams(id),
- FOREIGN KEY (opStaffId) REFERENCES opStaffs(id)
+ FOREIGN KEY (opStaffId) REFERENCES opStaffs(id),
+ PRIMARY KEY (operationTeamId, opStaffId)
);
""";
@@ -248,15 +248,15 @@ class JDBCRepository implements Repository
*/
private static String insertSQL(TeamMember teamMember){
return
- "INSERT INTO teamMember(" +
- "id,operationTeamId,opStaffId,lastUpdate" +
+ "INSERT INTO opStaffsInOperationTeams(" +
+ "operationTeamId,opStaffId,lastUpdate" +
") VALUES (" +
- sqlValue(teamMember.teamMemberId().value()) + "," +
sqlValue(teamMember.operationTeamId()) + "," +
sqlValue(teamMember.opStaffId()) + "," +
sqlValue(teamMember.lastUpdate()) +
");";
}
+ //INSERT INTO opStaffsInOperationTeams ("operationteamid","opstaffid","lastupdate") VALUES ('31','4444','2024-06-21 20:55:39.991047');
/**
* Creates an Operation object with the given result of a read SQL-Row.
diff --git a/opp/jdbc-repo-impl/src/test/java/Tests.java b/opp/jdbc-repo-impl/src/test/java/Tests.java
index 0cda509..4d7e5d0 100644
--- a/opp/jdbc-repo-impl/src/test/java/Tests.java
+++ b/opp/jdbc-repo-impl/src/test/java/Tests.java
@@ -77,7 +77,6 @@ public final class Tests
};
testTeamMember = new TeamMember(
- new Id<>("TeamMember2"),
testOperationTeam.id(),
testOPStaff.id(),
Instant.now()
@@ -87,7 +86,7 @@ public final class Tests
}
- @Test
+ //@Test
public void testRepoOperationSave(){
try {
@@ -102,7 +101,7 @@ public final class Tests
);
}
- @Test
+ //@Test
public void testRepoOperationUpdate() {
try {
@@ -334,7 +333,7 @@ public final class Tests
OperationTeam deleteOperationTeam = operationTeamService.process(deleteCommand);
}
- //@Test
+ @Test
public void testInsertTeamMember1() throws Exception{
try {
--
GitLab