Simplified SQL

Author: wolpert

common/src/main/java/com/codeheadsystems/motif/model/Timestamp.java

@@ -2,6 +2,8 @@
 
 import java.time.Clock;
 import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeParseException;
 import java.util.Objects;
 
@@ -42,4 +44,13 @@ public String toIso() {
     return timestamp.toString();
   }
 
+  /**
+   * Returns this timestamp as an OffsetDateTime in UTC.
+   *
+   * @return the UTC OffsetDateTime representation.
+   */
+  public OffsetDateTime toOffsetDateTime() {
+    return timestamp.atOffset(ZoneOffset.UTC);
+  }
+
 }

server-database/src/main/java/com/codeheadsystems/motif/server/db/EventDao.java

@@ -9,7 +9,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -32,8 +31,6 @@ public interface EventDao {
       + "JOIN subjects s ON e.subject_uuid = s.uuid "
       + "JOIN owners o ON e.owner_uuid = o.uuid";
 
-  // --- SQL-level methods ---
-
   @SqlUpdate("INSERT INTO events (uuid, owner_uuid, subject_uuid, value, timestamp) "
       + "VALUES (:uuid, :ownerUuid, :subjectUuid, :value, :timestamp) "
       + "ON CONFLICT (uuid) DO UPDATE SET "
@@ -72,15 +69,12 @@ List<Event> findByOwnerSubjectAndTimeRange(@Bind("ownerUuid") UUID ownerUuid,
                                               @Bind("from") OffsetDateTime from,
                                               @Bind("to") OffsetDateTime to);
 
-  // --- Domain-level methods ---
-
   default void store(Event event) {
-    upsert(
-        event.identifier().uuid(),
+    upsert(event.identifier().uuid(),
         event.owner().identifier().uuid(),
         event.subject().identifier().uuid(),
         event.value(),
-        event.timestamp().timestamp().atOffset(ZoneOffset.UTC));
+        event.timestamp().toOffsetDateTime());
   }
 
   default Optional<Event> get(Owner owner, Identifier identifier) {
@@ -96,23 +90,17 @@ default List<Event> findBySubject(Owner owner, Subject subject) {
   }
 
   default List<Event> findByTimeRange(Owner owner, Timestamp from, Timestamp to) {
-    return findByOwnerAndTimeRange(
-        owner.identifier().uuid(),
-        from.timestamp().atOffset(ZoneOffset.UTC),
-        to.timestamp().atOffset(ZoneOffset.UTC));
+    return findByOwnerAndTimeRange(owner.identifier().uuid(),
+        from.toOffsetDateTime(), to.toOffsetDateTime());
   }
 
   default List<Event> findBySubjectAndTimeRange(Owner owner, Subject subject,
                                                  Timestamp from, Timestamp to) {
-    return findByOwnerSubjectAndTimeRange(
-        owner.identifier().uuid(),
+    return findByOwnerSubjectAndTimeRange(owner.identifier().uuid(),
         subject.identifier().uuid(),
-        from.timestamp().atOffset(ZoneOffset.UTC),
-        to.timestamp().atOffset(ZoneOffset.UTC));
+        from.toOffsetDateTime(), to.toOffsetDateTime());
   }
 
-  // --- Row mapper ---
-
   class EventRowMapper implements RowMapper<Event> {
     @Override
     public Event map(ResultSet rs, StatementContext ctx) throws SQLException {

server-database/src/main/java/com/codeheadsystems/motif/server/db/OwnerDao.java

@@ -16,8 +16,6 @@
 @RegisterRowMapper(OwnerDao.OwnerRowMapper.class)
 public interface OwnerDao {
 
-  // --- SQL-level methods ---
-
   @SqlUpdate("INSERT INTO owners (uuid, value) "
       + "VALUES (:uuid, :value) "
       + "ON CONFLICT (uuid) DO UPDATE SET "
@@ -33,8 +31,6 @@ public interface OwnerDao {
   @SqlQuery("SELECT * FROM owners WHERE value = :value")
   Optional<Owner> findByValue(@Bind("value") String value);
 
-  // --- Domain-level methods ---
-
   default void store(Owner owner) {
     upsert(owner.identifier().uuid(), owner.value());
   }
@@ -51,8 +47,6 @@ default Optional<Owner> find(String value) {
     return findByValue(value.strip().toUpperCase());
   }
 
-  // --- Row mapper ---
-
   class OwnerRowMapper implements RowMapper<Owner> {
     @Override
     public Owner map(ResultSet rs, StatementContext ctx) throws SQLException {

server-database/src/main/java/com/codeheadsystems/motif/server/db/SubjectDao.java

@@ -23,8 +23,6 @@ public interface SubjectDao {
       + "o.value AS owner_value "
       + "FROM subjects s JOIN owners o ON s.owner_uuid = o.uuid";
 
-  // --- SQL-level methods ---
-
   @SqlUpdate("INSERT INTO subjects (uuid, owner_uuid, category, value) "
       + "VALUES (:uuid, :ownerUuid, :category, :value) "
       + "ON CONFLICT (uuid) DO UPDATE SET "
@@ -53,8 +51,6 @@ Optional<Subject> findByOwnerCategoryAndValue(@Bind("ownerUuid") UUID ownerUuid,
                                                  @Bind("category") String category,
                                                  @Bind("value") String value);
 
-  // --- Domain-level methods ---
-
   default void store(Subject subject) {
     upsert(subject.identifier().uuid(),
         subject.owner().identifier().uuid(),
@@ -78,8 +74,6 @@ default Optional<Subject> find(Owner owner, Category category, String value) {
     return findByOwnerCategoryAndValue(owner.identifier().uuid(), category.value(), value);
   }
 
-  // --- Row mapper ---
-
   class SubjectRowMapper implements RowMapper<Subject> {
     @Override
     public Subject map(ResultSet rs, StatementContext ctx) throws SQLException {