Skip to content
Snippets Groups Projects
Commit 552da99c authored by Andre Hartig's avatar Andre Hartig
Browse files

Reworked timestamps for classes.

parent 7e853498
Branches
No related tags found
No related merge requests found
import java.time.Instant;
public record OPStaff( public record OPStaff(
Id<OPStaff> opStaffId, Id<OPStaff> opStaffId,
Role role, Role role,
String specialty, String specialty,
ObjectTimestamp lastUpdate Instant lastUpdate
) { ) {
} }
import java.time.LocalDateTime;
public record ObjectTimestamp(
LocalDateTime timestamp,
ObjectModification objectModification
) {
}
import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.Optional; import java.util.Optional;
...@@ -14,7 +15,7 @@ public record Operation( ...@@ -14,7 +15,7 @@ public record Operation(
LocalDate date, LocalDate date,
LocalTime startTime, LocalTime startTime,
LocalTime endTime, LocalTime endTime,
ObjectTimestamp lastUpdate Instant lastUpdate
) { ) {
/** /**
......
import java.time.Instant;
import java.util.List; import java.util.List;
public record OperationTeam( public record OperationTeam(
Id<OperationTeam> operationTeamId, Id<OperationTeam> operationTeamId,
List<OPStaff> opStaffList, List<OPStaff> opStaffList,
ObjectTimestamp lastUpdate Instant lastUpdate
) { ) {
} }
import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
public record PreparationNote( public record PreparationNote(
Id<PreparationNote> preparationNoteId, Id<PreparationNote> preparationNoteId,
String text, String text,
Operation operationId, Operation operationId,
ObjectTimestamp lastUpdate Instant lastUpdate
) { ) {
} }
import java.time.Instant;
public record Room( public record Room(
Id<Room> roomId, Id<Room> roomId,
String roomName, String roomName,
ObjectTimestamp lastUpdate Instant lastUpdate
) { ) {
} }
...@@ -226,7 +226,8 @@ class JDBCRepository implements Repository ...@@ -226,7 +226,8 @@ class JDBCRepository implements Repository
id VARCHAR(50) PRIMARY KEY, id VARCHAR(50) PRIMARY KEY,
date DATE NOT NULL, date DATE NOT NULL,
startTime TIME NOT NULL, startTime TIME NOT NULL,
endTime TIME NOT NULL endTime TIME NOT NULL,
lastUpdate TIMESTAMP NOT NULL
); );
"""; """;
...@@ -238,12 +239,13 @@ class JDBCRepository implements Repository ...@@ -238,12 +239,13 @@ class JDBCRepository implements Repository
private static String insertSQL(Operation operation){ private static String insertSQL(Operation operation){
return return
"INSERT INTO operations(" + "INSERT INTO operations(" +
"id,date,startTime,endTime" + "id,date,startTime,endTime,lastUpdate" +
") VALUES (" + ") VALUES (" +
sqlValue(operation.id().value()) + "," + sqlValue(operation.id().value()) + "," +
sqlValue(operation.date()) + "," + sqlValue(operation.date()) + "," +
sqlValue(operation.startTime()) + "," + sqlValue(operation.startTime()) + "," +
sqlValue(operation.endTime()) + sqlValue(operation.endTime()) + "," +
sqlValue(operation.lastUpdate()) +
");"; ");";
} }
...@@ -258,6 +260,7 @@ class JDBCRepository implements Repository ...@@ -258,6 +260,7 @@ class JDBCRepository implements Repository
"date = " + sqlValue(operation.date()) + "," + "date = " + sqlValue(operation.date()) + "," +
"startTime = " + sqlValue(operation.startTime()) + "," + "startTime = " + sqlValue(operation.startTime()) + "," +
"endTime = " + sqlValue(operation.endTime()) + " " + "endTime = " + sqlValue(operation.endTime()) + " " +
"lastUpdate = " + sqlValue(operation.lastUpdate()) + " " +
"WHERE id = " + sqlValue(operation.id().value()) + ";"; "WHERE id = " + sqlValue(operation.id().value()) + ";";
} }
...@@ -369,11 +372,13 @@ class JDBCRepository implements Repository ...@@ -369,11 +372,13 @@ class JDBCRepository implements Repository
* @throws SQLException Error while reading the SQL-Row * @throws SQLException Error while reading the SQL-Row
*/ */
private static Operation readOperationFromRow(ResultSet rs) throws SQLException { private static Operation readOperationFromRow(ResultSet rs) throws SQLException {
return new Operation( return new Operation(
new Id<>(rs.getString("id")), new Id<>(rs.getString("id")),
rs.getDate("date").toLocalDate(), rs.getDate("date").toLocalDate(),
rs.getTime("startTime").toLocalTime(), rs.getTime("startTime").toLocalTime(),
rs.getTime("endTime").toLocalTime() rs.getTime("endTime").toLocalTime(),
rs.getTimestamp("lastUpdate").toInstant()
); );
} }
} }
import java.time.Instant;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
...@@ -36,7 +37,8 @@ public class OperationServiceImpl implements OperationService { ...@@ -36,7 +37,8 @@ public class OperationServiceImpl implements OperationService {
repo.operationId(), repo.operationId(),
cr.date(), cr.date(),
cr.startTime(), cr.startTime(),
cr.endTime()); cr.endTime(),
Instant.now());
repo.save(operation); repo.save(operation);
......
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.List; import java.util.List;
...@@ -45,7 +46,8 @@ public final class Tests ...@@ -45,7 +46,8 @@ public final class Tests
new Id<>("1111"), new Id<>("1111"),
LocalDate.of(2024, 05, 24), LocalDate.of(2024, 05, 24),
LocalTime.of(13, 35, 00), LocalTime.of(13, 35, 00),
LocalTime.of(14, 00, 00)); LocalTime.of(14, 00, 00),
Instant.now());
opService = new OperationServiceImpl(repo); opService = new OperationServiceImpl(repo);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment