diff --git a/opp/core/src/main/java/OperationTeamImpl.java b/opp/core/src/main/java/OperationTeamImpl.java index dd0a2160427757e6453d933cc7054e57b06cb54f..94d5e42338f803b0cac2ac23c57d5183d5f7eb4b 100644 --- a/opp/core/src/main/java/OperationTeamImpl.java +++ b/opp/core/src/main/java/OperationTeamImpl.java @@ -1,5 +1,6 @@ import java.sql.SQLException; import java.time.Instant; +import java.util.List; import java.util.Optional; public class OperationTeamImpl implements OperationTeamService{ @@ -42,12 +43,10 @@ public class OperationTeamImpl implements OperationTeamService{ } @Override - public Optional<OperationTeam> getOperationTeams() { - return Optional.empty(); - } + public List<OperationTeam> getOperationTeams() throws SQLException { - @Override - public Optional<OPStaff> getOperationTeamOPStaff(Id<OperationTeam> operationTeamId) { - return Optional.empty(); + return repo.getOperationTeamsImp(); } + + } diff --git a/opp/core/src/main/java/OperationTeamService.java b/opp/core/src/main/java/OperationTeamService.java index 6a9a4e66adce7e9e1800ecfb7034be596a40688a..59cbfefd75fc4d02f33732da11cd53585b8830ba 100644 --- a/opp/core/src/main/java/OperationTeamService.java +++ b/opp/core/src/main/java/OperationTeamService.java @@ -1,4 +1,5 @@ import java.sql.SQLException; +import java.util.List; import java.util.Optional; public interface OperationTeamService { @@ -7,9 +8,9 @@ public interface OperationTeamService { public Optional<OperationTeam> getOperationTeam(Id<OperationTeam> operationTeamId) throws SQLException; - public Optional<OperationTeam> getOperationTeams(); + public List<OperationTeam> getOperationTeams() throws SQLException; - public Optional<OPStaff> getOperationTeamOPStaff(Id<OperationTeam> operationTeamId); + //public Optional<OPStaff> getOperationTeamOPStaff(Id<OperationTeam> operationTeamId); } diff --git a/opp/core/src/main/java/Repository.java b/opp/core/src/main/java/Repository.java index 28ef7b33016c04217f489a414fddd279b438cf98..f540cac6a4ffc3ed09a9d4e2b24f0304c32439f4 100644 --- a/opp/core/src/main/java/Repository.java +++ b/opp/core/src/main/java/Repository.java @@ -85,6 +85,7 @@ public interface Repository { OperationTeam deleteOperationTeam(Id<OperationTeam> id) throws SQLException; Optional<OperationTeam> getOperationTeamImp(Id<OperationTeam> id) throws SQLException; + List<OperationTeam> getOperationTeamsImp() throws SQLException; diff --git a/opp/core/target/classes/OperationServiceImpl.class b/opp/core/target/classes/OperationServiceImpl.class index 68a2df94faa436e17a7e7e988b4164b1d43d4f67..f9df88a43ac5b5ea7e34ac51a1ee85e6ac1df0e3 100644 Binary files a/opp/core/target/classes/OperationServiceImpl.class and b/opp/core/target/classes/OperationServiceImpl.class differ diff --git a/opp/jdbc-repo-impl/src/main/java/JDBCRepository.java b/opp/jdbc-repo-impl/src/main/java/JDBCRepository.java index 615d09f1e82587373575726bd42259192b89f17b..eb7e0671f5e6d6a1c00ec545d049138f286a9e24 100644 --- a/opp/jdbc-repo-impl/src/main/java/JDBCRepository.java +++ b/opp/jdbc-repo-impl/src/main/java/JDBCRepository.java @@ -639,6 +639,28 @@ class JDBCRepository implements Repository } } + + public List<OperationTeam> getOperationTeamsImp() throws SQLException{ + + try( + var result = + conn.createStatement() + .executeQuery("SELECT * FROM operationteam;"); + ) { + + var operationTeam = new ArrayList<OperationTeam>(); + + while (result.next()) { + operationTeam.add(readOperationTeamFromRow(result)); + } + return operationTeam; + }catch(SQLException e){ + throw new RuntimeException(e); + } + + } + + private static OperationTeam readOperationTeamFromRow(ResultSet rs) throws SQLException{ return new OperationTeam( diff --git a/opp/jdbc-repo-impl/src/test/java/Tests.java b/opp/jdbc-repo-impl/src/test/java/Tests.java index a9887faee1074ef64d9d3ba110b283a57fed0317..fd5c1309ba46471d929f26f299d895240a7dff61 100644 --- a/opp/jdbc-repo-impl/src/test/java/Tests.java +++ b/opp/jdbc-repo-impl/src/test/java/Tests.java @@ -325,7 +325,7 @@ public final class Tests } } - @Test + //@Test public void testGetOperationTeam() throws Exception{ var id = new Id<OperationTeam>("31313131"); @@ -340,6 +340,22 @@ public final class Tests } catch (Exception e){ e.printStackTrace(); } + } + + @Test + public void testGetMultipleOperationTeams() throws Exception{ + + + try{ + List<OperationTeam> operationTeam = operationTeamService.getOperationTeams(); + + for(OperationTeam operationTeam1 : operationTeam){ + System.out.println(operationTeam1); + } + + } catch (Exception e){ + e.printStackTrace(); + } } diff --git a/opp/jdbc-repo-impl/target/classes/JDBCRepository.class b/opp/jdbc-repo-impl/target/classes/JDBCRepository.class index 13bfa06cfcba8bd9e40b0699c3a973332cd55f34..498c1eb4fe8c6f5d96fc05fa726f1ed45e7137b8 100644 Binary files a/opp/jdbc-repo-impl/target/classes/JDBCRepository.class and b/opp/jdbc-repo-impl/target/classes/JDBCRepository.class differ