Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
8705e27
WIP implement TOA5 upload http handler, need to hook up to router
dennisgsmith Mar 11, 2024
9eb2810
Merge branch 'develop' into enhancement/toa5-uploads
dennisgsmith Oct 3, 2024
7d34ac4
Merge branch 'develop' into enhancement/toa5-uploads
dennisgsmith Oct 22, 2024
392e22e
wip; create uploader service
dennisgsmith Oct 22, 2024
525636f
initial sqlc query migration
dennisgsmith Oct 31, 2024
13b806c
wip
dennisgsmith Oct 31, 2024
2253490
wip; sqlc queries
dennisgsmith Nov 6, 2024
99ff6d3
add timezone options list
dennisgsmith Nov 6, 2024
3b36dcf
add collection group tests with sort order
dennisgsmith Nov 6, 2024
fe2c6de
add sort order to collection group timesries
dennisgsmith Nov 6, 2024
bbcbec7
fix tests for cg sort order timeseries
dennisgsmith Nov 6, 2024
4242d2d
add uploader config endpoints
dennisgsmith Nov 7, 2024
b17420d
Merge branch 'enhancement/toa5-uploads' into enhancement/sqlc
dennisgsmith Nov 7, 2024
fd8d467
resolve danginling issues from merge conflict with uploader feature b…
dennisgsmith Nov 7, 2024
ad99622
fix uploader service function definitions
dennisgsmith Nov 7, 2024
bb4f480
fix uploader config mapping create sql statement
dennisgsmith Nov 7, 2024
bd42ce8
Merge branch 'enhancement/toa5-uploads' into enhancement/sqlc
dennisgsmith Nov 7, 2024
080f85c
fix create uploader config sql statement
dennisgsmith Nov 7, 2024
b64df79
Merge branch 'enhancement/toa5-uploads' into enhancement/sqlc
dennisgsmith Nov 7, 2024
fb8d46b
wip; fix existing db queries; start incl v2
dennisgsmith Nov 8, 2024
238dd45
fix uploader config missing slug
dennisgsmith Nov 8, 2024
3dc7830
Merge branch 'enhancement/toa5-uploads' into enhancement/sqlc
dennisgsmith Nov 8, 2024
f6d8a57
Merge branch 'develop' into enhancement/toa5-uploads
dennisgsmith Nov 8, 2024
d8c06df
Merge branch 'enhancement/toa5-uploads' into enhancement/sqlc
dennisgsmith Nov 8, 2024
e0beba5
complete basis for sqlc migration and large refactor; fix uploader ba…
dennisgsmith Nov 12, 2024
122cd38
fix: failing regression tests from refactored return types
dennisgsmith Nov 15, 2024
6026aee
add updated incl opts to instrument uploader
dennisgsmith Nov 15, 2024
56e6e93
chore: move uploader parsers to separate file
dennisgsmith Nov 15, 2024
6600255
add time/notes options to config
dennisgsmith Nov 15, 2024
fca10c6
fix: missing null fields for insert and update queries
dennisgsmith Nov 15, 2024
324448c
feat: implement parser logic
dennisgsmith Nov 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion api/Dockerfile.openapi
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN go install github.com/swaggo/swag/cmd/swag@latest

COPY . .
RUN swag init --ot json --pd -g cmd/midas-api/main.go --parseInternal true --dir internal
RUN find ./docs -type f -exec sed -i '' -e 's/github_com_USACE_instrumentation-api_api_internal_model.//g' {} \;
RUN find ./docs -type f -exec sed -i '' -e 's/github_com_USACE_instrumentation-api_api_internal_//g' {} \;

FROM openapitools/openapi-generator-cli:latest-release AS docgen
WORKDIR /work
Expand Down
10 changes: 2 additions & 8 deletions api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,12 @@ require (
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/google/uuid v1.6.0
github.com/hashicorp/go-version v1.7.0
github.com/jackc/pgconn v1.14.3
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438
github.com/jackc/pgtype v1.14.3
github.com/jackc/pgx/v5 v5.7.0
github.com/jackc/pgx/v5 v5.7.1
github.com/jmoiron/sqlx v1.4.0
github.com/labstack/echo-jwt/v4 v4.2.0
github.com/labstack/echo/v4 v4.12.0
github.com/lib/pq v1.10.9
github.com/paulmach/orb v0.11.1
github.com/stretchr/testify v1.9.0
github.com/tidwall/btree v1.7.0
github.com/xeipuuv/gojsonschema v1.2.0
Expand All @@ -51,13 +48,11 @@ require (
github.com/aws/smithy-go v1.20.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/pgx/v4 v4.18.3 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
Expand All @@ -68,7 +63,6 @@ require (
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
go.mongodb.org/mongo-driver v1.16.1 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
Expand Down
57 changes: 6 additions & 51 deletions api/go.sum

Large diffs are not rendered by default.

218 changes: 218 additions & 0 deletions api/internal/db/alert.sql_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

127 changes: 127 additions & 0 deletions api/internal/db/alert_check.sql_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading