Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[elixir] fix: inserting of ready loads should cover loads from the last 24 hours #84

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[elixir] fix: inserting of ready loads should cover loads from the last 24 hours #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions ex_cubic_ingestion/lib/ex_cubic_ingestion/schema/cubic_load.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,24 +80,25 @@ defmodule ExCubicIngestion.Schema.CubicLoad do
@spec insert_new_from_objects_with_table([map()], CubicTable.t()) ::
{:ok, [t()]} | {:error, term()}
def insert_new_from_objects_with_table(objects, table) do
datetime_since = DateTime.add(DateTime.utc_now(), -86_400)

# get the last inserted load which will be used to further filter the objects
last_inserted_load_rec =
Repo.one(
last_inserted_load_recs =
Repo.all(
from(load in not_deleted(),
where: load.table_id == ^table.id,
order_by: [desc: load.s3_modified],
limit: 1
where: load.table_id == ^table.id and load.s3_modified > ^datetime_since,
order_by: [desc: load.s3_modified]
)
)

# create a list of objects that have a last modified that is later than
# the last object we have in database
new_objects =
Enum.filter(objects, fn object ->
last_modified = parse_and_drop_msec(object.last_modified)

is_nil(last_inserted_load_rec) or
DateTime.compare(last_modified, last_inserted_load_rec.s3_modified) == :gt
not Enum.any?(last_inserted_load_recs, fn rec ->
rec.s3_key == object.key and
rec.s3_modified == parse_and_drop_msec(object.last_modified)
end)
end)

if Enum.empty?(new_objects) do
Expand Down
28 changes: 25 additions & 3 deletions ex_cubic_ingestion/test/ex_cubic_ingestion/schema/cubic_load_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ defmodule ExCubicIngestion.Schema.CubicLoadTest do
}}
end

describe "insert_new_from_objects_with_table/1" do
describe "insert_new_from_objects_with_table/3" do
test "providing a non-empty list of objects", %{
table: table,
utc_now: utc_now,
Expand All @@ -61,7 +61,7 @@ defmodule ExCubicIngestion.Schema.CubicLoadTest do
assert {:ok, []} == CubicLoad.insert_new_from_objects_with_table(load_objects, table)

# add a new object
load_objects = [
updated_load_objects = [
%{
key: "cubic/dmap/sample/20220103.csv.gz",
last_modified: MockExAws.Data.dt_adjust_and_format(utc_now, -2400),
Expand All @@ -76,7 +76,29 @@ defmodule ExCubicIngestion.Schema.CubicLoadTest do
%CubicLoad{
s3_key: "cubic/dmap/sample/20220103.csv.gz"
}
]} = CubicLoad.insert_new_from_objects_with_table(load_objects, table)
]} = CubicLoad.insert_new_from_objects_with_table(updated_load_objects, table)

# lastly, add one more but with an older timestamp than the last one
updated_load_objects_with_one_extra = [
%{
key: "cubic/dmap/sample/20220104.csv.gz",
last_modified: MockExAws.Data.dt_adjust_and_format(utc_now, -2700),
size: "197"
}
| updated_load_objects
]

# adding one more load object, should only insert it as a load record
assert {:ok,
[
%CubicLoad{
s3_key: "cubic/dmap/sample/20220104.csv.gz"
}
]} =
CubicLoad.insert_new_from_objects_with_table(
updated_load_objects_with_one_extra,
table
)
end

test "providing an empty list of objects", %{
Expand Down