Rename datasets.last_modified (#700)

* Rename datasets.last_modified Signed-off-by: wslulciuc <[email protected]> * continued: Rename datasets.last_modified Signed-off-by: wslulciuc <[email protected]>
MarquezProject · Jan 12, 2020 · 224b948 · 224b948
1 parent 9586ec2
commit 224b948
Show file tree

Hide file tree

Showing 19 changed files with 52 additions and 51 deletions.
diff --git a/docs/openapi.html b/docs/openapi.html
diff --git a/docs/openapi.yml b/docs/openapi.yml
@@ -1064,8 +1064,8 @@ components:
  tags:
  description: List of tags.
  type: array
- lastModified:
- description: An [ISO-8601](https://en.wikipedia.org/wiki/ISO_8601) timestamp representing the date/time the dataset was last modified by a run.
+ lastModifiedAt:
+ description: An [ISO-8601](https://en.wikipedia.org/wiki/ISO_8601) timestamp representing the date/time the dataset was last modified by a successful run.
  type: string
  format: date-time
  description:
@@ -1086,7 +1086,7 @@ components:
  {'name': 'member_id', 'type': 'INTEGER', 'tags': []}
  ]
  tags: ['SENSITIVE']
- lastModified: null
+ lastModifiedAt: null
  description: "All room booking occupancy data."
 
  datasets:
@@ -1143,8 +1143,8 @@ components:
  tags:
  description: List of tags.
  type: array
- lastModified:
- description: An [ISO-8601](https://en.wikipedia.org/wiki/ISO_8601) timestamp representing the date/time the dataset was last modified by a run.
+ lastModifiedAt:
+ description: An [ISO-8601](https://en.wikipedia.org/wiki/ISO_8601) timestamp representing the date/time the dataset was last modified by a successful run.
  type: string
  format: date-time
  description:
@@ -1165,7 +1165,7 @@ components:
  {'name': 'member_id', 'type': 'INTEGER', 'tags': ['SENSITIVE']}
  ]
  tags: ['SENSITIVE']
- lastModified: null
+ lastModifiedAt: null
  description: "All room booking occupancy data."
 
  newSource:

diff --git a/src/main/java/marquez/api/mappers/Mapper.java b/src/main/java/marquez/api/mappers/Mapper.java
@@ -165,7 +165,7 @@ private static DatasetResponse toDbTableResponse(@NonNull final Dataset dataset)
  dataset.getSourceName().getValue(),
  dataset.getFields(),
  dataset.getTags(),
- dataset.getLastModified().map(ISO_INSTANT::format).orElse(null),
+ dataset.getLastModifiedAt().map(ISO_INSTANT::format).orElse(null),
  dataset.getDescription().orElse(null));
  }
 
@@ -179,7 +179,7 @@ private static DatasetResponse toStreamResponse(@NonNull final Dataset dataset)
  ((Stream) dataset).getSchemaLocation().toString(),
  dataset.getFields(),
  dataset.getTags(),
- dataset.getLastModified().map(ISO_INSTANT::format).orElse(null),
+ dataset.getLastModifiedAt().map(ISO_INSTANT::format).orElse(null),
  dataset.getDescription().orElse(null));
  }
 

diff --git a/src/main/java/marquez/api/models/DatasetResponse.java b/src/main/java/marquez/api/models/DatasetResponse.java
@@ -43,7 +43,7 @@ public abstract class DatasetResponse {
  @Getter private final String sourceName;
  @Nullable private final List<Field> fields;
  @Nullable private final List<String> tags;
- @Nullable private final String lastModified;
+ @Nullable private final String lastModifiedAt;
  @Nullable private final String description;
 
  public DatasetResponse(
@@ -54,7 +54,7 @@ public DatasetResponse(
  @NonNull final String sourceName,
  @Nullable final List<Field> fields,
  @Nullable final List<String> tags,
- @Nullable final String lastModified,
+ @Nullable final String lastModifiedAt,
  @Nullable final String description) {
  this.name = checkNotBlank(name);
  this.physicalName = checkNotBlank(physicalName);
@@ -63,7 +63,7 @@ public DatasetResponse(
  this.sourceName = checkNotBlank(sourceName);
  this.fields = fields;
  this.tags = tags;
- this.lastModified = lastModified;
+ this.lastModifiedAt = lastModifiedAt;
  this.description = description;
  }
 
@@ -75,8 +75,8 @@ public List<String> getTags() {
  return (tags == null) ? ImmutableList.of() : ImmutableList.copyOf(tags);
  }
 
- public Optional<String> getLastModified() {
- return Optional.ofNullable(lastModified);
+ public Optional<String> getLastModifiedAt() {
+ return Optional.ofNullable(lastModifiedAt);
  }
 
  public Optional<String> getDescription() {

diff --git a/src/main/java/marquez/api/models/DbTableResponse.java b/src/main/java/marquez/api/models/DbTableResponse.java
@@ -31,7 +31,7 @@ public DbTableResponse(
  final String sourceName,
  @Nullable final List<Field> fields,
  @Nullable final List<String> tags,
- @Nullable final String lastModified,
+ @Nullable final String lastModifiedAt,
  @Nullable final String description) {
  super(
  name,
@@ -41,7 +41,7 @@ public DbTableResponse(
  sourceName,
  fields,
  tags,
- lastModified,
+ lastModifiedAt,
  description);
  }
 }
diff --git a/src/main/java/marquez/api/models/StreamResponse.java b/src/main/java/marquez/api/models/StreamResponse.java
@@ -37,7 +37,7 @@
  "schemaLocation",
  "fields",
  "tags",
- "lastModified",
+ "lastModifiedAt",
  "description"
 })
 public final class StreamResponse extends DatasetResponse {
@@ -52,7 +52,7 @@ public StreamResponse(
  @NonNull final String schemaLocation,
  @Nullable final List<Field> fields,
  @Nullable final List<String> tags,
- @Nullable final String lastModified,
+ @Nullable final String lastModifiedAt,
  @Nullable final String description) {
  super(
  name,
@@ -62,7 +62,7 @@ public StreamResponse(
  sourceName,
  fields,
  tags,
- lastModified,
+ lastModifiedAt,
  description);
  this.schemaLocation = checkNotBlank(schemaLocation);
  }

diff --git a/src/main/java/marquez/db/Columns.java b/src/main/java/marquez/db/Columns.java
@@ -58,7 +58,7 @@ private Columns() {}
  public static final String TAG_UUID = "tag_uuid";
  public static final String TAG_UUIDS = "tag_uuids";
  public static final String TAGGED_AT = "tagged_at";
- public static final String LAST_MODIFIED = "last_modified";
+ public static final String LAST_MODIFIED_AT = "last_modified_at";
 
  /* DATASET VERSION ROW COLUMNS */
  public static final String FIELD_UUIDS = "field_uuids";

diff --git a/src/main/java/marquez/db/DatasetDao.java b/src/main/java/marquez/db/DatasetDao.java
@@ -79,11 +79,11 @@ default void insert(DatasetRow row) {
 
  @SqlUpdate(
  "UPDATE datasets "
- + "SET updated_at = :lastModified, "
- + " last_modified = :lastModified "
+ + "SET updated_at = :lastModifiedAt, "
+ + " last_modified_at = :lastModifiedAt "
  + "WHERE uuid IN (<rowUuids>)")
  void updateLastModifed(
- @BindList(onEmpty = NULL_STRING) List<UUID> rowUuids, Instant lastModified);
+ @BindList(onEmpty = NULL_STRING) List<UUID> rowUuids, Instant lastModifiedAt);
 
  @SqlUpdate(
  "UPDATE datasets "

diff --git a/src/main/java/marquez/db/RunStateDao.java b/src/main/java/marquez/db/RunStateDao.java
@@ -38,8 +38,8 @@ public interface RunStateDao extends SqlObject {
  default void insertWith(RunStateRow row, List<UUID> inputVersionUuids) {
  insert(row);
  // Modified
- final Instant lastModified = row.getTransitionedAt();
- createDatasetDao().updateLastModifed(inputVersionUuids, lastModified);
+ final Instant lastModifiedAt = row.getTransitionedAt();
+ createDatasetDao().updateLastModifed(inputVersionUuids, lastModifiedAt);
  }
 
  @Transaction

diff --git a/src/main/java/marquez/db/mappers/DatasetRowMapper.java b/src/main/java/marquez/db/mappers/DatasetRowMapper.java
@@ -44,7 +44,7 @@ public DatasetRow map(@NonNull ResultSet results, @NonNull StatementContext cont
  stringOrThrow(results, Columns.NAME),
  stringOrThrow(results, Columns.PHYSICAL_NAME),
  uuidArrayOrThrow(results, Columns.TAG_UUIDS),
- timestampOrNull(results, Columns.LAST_MODIFIED),
+ timestampOrNull(results, Columns.LAST_MODIFIED_AT),
  stringOrNull(results, Columns.DESCRIPTION),
  uuidOrNull(results, Columns.CURRENT_VERSION_UUID));
  }

diff --git a/src/main/java/marquez/db/mappers/ExtendedDatasetRowMapper.java b/src/main/java/marquez/db/mappers/ExtendedDatasetRowMapper.java
@@ -45,7 +45,7 @@ public ExtendedDatasetRow map(@NonNull ResultSet results, @NonNull StatementCont
  stringOrThrow(results, Columns.NAME),
  stringOrThrow(results, Columns.PHYSICAL_NAME),
  uuidArrayOrThrow(results, Columns.TAG_UUIDS),
- timestampOrNull(results, Columns.LAST_MODIFIED),
+ timestampOrNull(results, Columns.LAST_MODIFIED_AT),
  stringOrNull(results, Columns.DESCRIPTION),
  uuidOrNull(results, Columns.CURRENT_VERSION_UUID));
  }

diff --git a/src/main/java/marquez/db/models/DatasetRow.java b/src/main/java/marquez/db/models/DatasetRow.java
@@ -38,12 +38,12 @@ public class DatasetRow {
  @Getter @NonNull private final String name;
  @Getter @NonNull private final String physicalName;
  @Getter @NonNull List<UUID> tagUuids;
- @Nullable private final Instant lastModified;
+ @Nullable private final Instant lastModifiedAt;
  @Nullable private final String description;
  @Nullable private final UUID currentVersionUuid;
 
- public Optional<Instant> getLastModified() {
- return Optional.ofNullable(lastModified);
+ public Optional<Instant> getLastModifiedAt() {
+ return Optional.ofNullable(lastModifiedAt);
  }
 
  public Optional<String> getDescription() {

diff --git a/src/main/java/marquez/service/mappers/Mapper.java b/src/main/java/marquez/service/mappers/Mapper.java
@@ -163,7 +163,7 @@ private static Dataset toDbTable(
  SourceName.of(row.getSourceName()),
  fields,
  tags,
- row.getLastModified().orElse(null),
+ row.getLastModifiedAt().orElse(null),
  row.getDescription().orElse(null));
  }
 
@@ -181,7 +181,7 @@ private static Dataset toStream(
  Utils.toUrl(((StreamVersionRow) versionRow).getSchemaLocation()),
  fields,
  tags,
- row.getLastModified().orElse(null),
+ row.getLastModifiedAt().orElse(null),
  row.getDescription().orElse(null));
  }
 

diff --git a/src/main/java/marquez/service/models/Dataset.java b/src/main/java/marquez/service/models/Dataset.java
@@ -39,7 +39,7 @@ public abstract class Dataset {
  @Getter private final SourceName sourceName;
  @Nullable private final List<Field> fields;
  @Nullable private final List<String> tags;
- @Nullable private final Instant lastModified;
+ @Nullable private final Instant lastModifiedAt;
  @Nullable private final String description;
 
  public Dataset(
@@ -51,7 +51,7 @@ public Dataset(
  @NonNull final SourceName sourceName,
  @Nullable final List<Field> fields,
  @Nullable final List<String> tags,
- @Nullable final Instant lastModified,
+ @Nullable final Instant lastModifiedAt,
  @Nullable final String description) {
  this.type = type;
  this.name = name;
@@ -61,7 +61,7 @@ public Dataset(
  this.sourceName = sourceName;
  this.fields = fields;
  this.tags = tags;
- this.lastModified = lastModified;
+ this.lastModifiedAt = lastModifiedAt;
  this.description = description;
  }
 
@@ -73,8 +73,8 @@ public List<String> getTags() {
  return (tags == null) ? ImmutableList.of() : ImmutableList.copyOf(tags);
  }
 
- public Optional<Instant> getLastModified() {
- return Optional.ofNullable(lastModified);
+ public Optional<Instant> getLastModifiedAt() {
+ return Optional.ofNullable(lastModifiedAt);
  }
 
  public Optional<String> getDescription() {

diff --git a/src/main/java/marquez/service/models/DbTable.java b/src/main/java/marquez/service/models/DbTable.java
@@ -36,7 +36,7 @@ public DbTable(
  final SourceName sourceName,
  @Nullable final List<Field> fields,
  @Nullable final List<String> tags,
- @Nullable final Instant lastModified,
+ @Nullable final Instant lastModifiedAt,
  @Nullable final String description) {
  super(
  DB_TABLE,
@@ -47,7 +47,7 @@ public DbTable(
  sourceName,
  fields,
  tags,
- lastModified,
+ lastModifiedAt,
  description);
  }
 }
diff --git a/src/main/java/marquez/service/models/Stream.java b/src/main/java/marquez/service/models/Stream.java
@@ -42,7 +42,7 @@ public Stream(
  @NonNull final URL schemaLocation,
  @Nullable final List<Field> fields,
  @Nullable final List<String> tags,
- @Nullable final Instant lastModified,
+ @Nullable final Instant lastModifiedAt,
  @Nullable final String description) {
  super(
  STREAM,
@@ -53,7 +53,7 @@ public Stream(
  sourceName,
  fields,
  tags,
- lastModified,
+ lastModifiedAt,
  description);
  this.schemaLocation = schemaLocation;
  }

diff --git a/src/main/resources/db/migration/V11__alter_datasets_to_rename_last_modified.sql b/src/main/resources/db/migration/V11__alter_datasets_to_rename_last_modified.sql
@@ -0,0 +1 @@
+ALTER TABLE datasets RENAME last_modified TO last_modified_at;
diff --git a/src/test/java/marquez/MarquezAppIntegrationTest.java b/src/test/java/marquez/MarquezAppIntegrationTest.java
@@ -334,8 +334,8 @@ public void testApp_createRunAndMarkAsComplete() {
  assertThat(response3.getStatus()).isEqualTo(HTTP_200);
  assertThat((String) dataset.get("name")).isEqualTo(datasetName.getValue());
 
- final Instant lastModified = Instant.parse((String) dataset.get("lastModified"));
- assertThat(lastModified).isAfter(beforeModified);
+ final Instant lastModifiedAt = Instant.parse((String) dataset.get("lastModifiedAt"));
+ assertThat(lastModifiedAt).isAfter(beforeModified);
  });
  }
 }
diff --git a/src/test/java/marquez/db/DatasetDaoTest.java b/src/test/java/marquez/db/DatasetDaoTest.java
@@ -144,11 +144,11 @@ public void testLastModified() {
  datasetDao.insert(newRow);
 
  // Modified
- final Instant lastModified = newTimestamp();
- datasetDao.updateLastModifed(Lists.newArrayList(newRow.getUuid()), lastModified);
+ final Instant lastModifiedAt = newTimestamp();
+ datasetDao.updateLastModifed(Lists.newArrayList(newRow.getUuid()), lastModifiedAt);
 
  final ExtendedDatasetRow row = datasetDao.findBy(newRow.getUuid()).get();
- assertThat(row.getLastModified()).isPresent().hasValue(lastModified);
+ assertThat(row.getLastModifiedAt()).isPresent().hasValue(lastModifiedAt);
  }
 
  @Test