From 8d47b94dcb7e133f6aeb0078a2219add5f96fcd4 Mon Sep 17 00:00:00 2001 From: SoXX Date: Thu, 29 Aug 2024 14:58:42 +0200 Subject: [PATCH 1/4] feat(database): set timezone in migrations --- .../migrations/001_inital_database.sql | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/database/migrations/001_inital_database.sql b/pkg/database/migrations/001_inital_database.sql index 95bde1d..ce6e908 100644 --- a/pkg/database/migrations/001_inital_database.sql +++ b/pkg/database/migrations/001_inital_database.sql @@ -21,9 +21,9 @@ CREATE TABLE "Post" ( id CHAR(25) PRIMARY KEY, rating Rating, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - deleted_at TIMESTAMP NULL NULL + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + deleted_at TIMESTAMP WITH TIME ZONE NULL NULL ); CREATE TABLE "Source" @@ -32,26 +32,26 @@ CREATE TABLE "Source" display_name TEXT NULL, icon TEXT NULL, domain TEXT NOT NULL UNIQUE, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - deleted_at TIMESTAMP NULL + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + deleted_at TIMESTAMP WITH TIME ZONE NULL ); CREATE TABLE "Tag" ( name TEXT PRIMARY KEY, tag_type TagType, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - deleted_at TIMESTAMP NULL + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + deleted_at TIMESTAMP WITH TIME ZONE NULL ); CREATE TABLE "User" ( id TEXT PRIMARY KEY, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - deleted_at TIMESTAMP NULL + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + deleted_at TIMESTAMP WITH TIME ZONE NULL ); CREATE TABLE "PostReference" @@ -70,22 +70,22 @@ CREATE TABLE "TagAlias" ( name TEXT PRIMARY KEY, tag_id TEXT REFERENCES "Tag" (name), - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP ); CREATE TABLE "TagGroup" ( name TEXT PRIMARY KEY, tag_id TEXT REFERENCES "Tag" (name), - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP ); CREATE TABLE "UserSource" ( id CHAR(25) PRIMARY KEY, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - deleted_at TIMESTAMP NULL NULL, + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + deleted_at TIMESTAMP WITH TIME ZONE NULL NULL, user_id TEXT REFERENCES "User" (id), source_id TEXT REFERENCES "Source" (id), scrape_time_interval TEXT, @@ -100,9 +100,9 @@ CREATE TABLE "UserSource" CREATE TABLE "UserFavorites" ( id CHAR(25) PRIMARY KEY, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - deleted_at TIMESTAMP NULL NULL, + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + deleted_at TIMESTAMP WITH TIME ZONE NULL NULL, user_id TEXT REFERENCES "User" (id), post_id TEXT REFERENCES "Post" (id), user_source_id CHAR(25) REFERENCES "UserSource" (id) -- 2.45.2 From 2391bad68ed2cd614d8287753be950d5de6efcd4 Mon Sep 17 00:00:00 2001 From: SoXX Date: Thu, 29 Aug 2024 15:02:39 +0200 Subject: [PATCH 2/4] feat(version): updated to version 4 --- README.md | 8 ++++---- go.mod | 2 +- pkg/database/client.go | 8 ++++---- pkg/database/client_test.go | 4 ++-- pkg/database/favorite.go | 6 +++--- pkg/database/favorite_test.go | 4 ++-- pkg/database/post.go | 6 +++--- pkg/database/post_test.go | 4 ++-- pkg/database/scopes.go | 2 +- pkg/database/scopes_test.go | 4 ++-- pkg/database/source.go | 6 +++--- pkg/database/source_test.go | 4 ++-- pkg/database/tag.go | 6 +++--- pkg/database/tagAlias.go | 6 +++--- pkg/database/tagAlias_test.go | 4 ++-- pkg/database/tagGroup.go | 6 +++--- pkg/database/tagGroup_test.go | 4 ++-- pkg/database/tag_test.go | 4 ++-- pkg/database/user.go | 6 +++--- pkg/database/userSource.go | 6 +++--- pkg/database/userSource_test.go | 4 ++-- pkg/database/user_test.go | 4 ++-- test/generator.go | 2 +- test/helper.go | 2 +- 24 files changed, 56 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index 5096c0a..2df0826 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Build Check Runner](https://git.anthrove.art/Anthrove/otter-space-sdk/v3/actions/workflows/build_check.yaml/badge.svg) +![Build Check Runner](https://git.anthrove.art/Anthrove/otter-space-sdk/v4/actions/workflows/build_check.yaml/badge.svg) [![Bugs](https://sonarqube.dragse.de/api/project_badges/measure?project=Anthrove---OtterSpace-SDK&metric=bugs&token=sqb_96012ffdd64ce721d7f9c82bfa77aa27a5c1fd38)](https://sonarqube.dragse.de/dashboard?id=Anthrove---OtterSpace-SDK) [![Code Smells](https://sonarqube.dragse.de/api/project_badges/measure?project=Anthrove---OtterSpace-SDK&metric=code_smells&token=sqb_96012ffdd64ce721d7f9c82bfa77aa27a5c1fd38)](https://sonarqube.dragse.de/dashboard?id=Anthrove---OtterSpace-SDK) [![Coverage](https://sonarqube.dragse.de/api/project_badges/measure?project=Anthrove---OtterSpace-SDK&metric=coverage&token=sqb_96012ffdd64ce721d7f9c82bfa77aa27a5c1fd38)](https://sonarqube.dragse.de/dashboard?id=Anthrove---OtterSpace-SDK) @@ -22,7 +22,7 @@ The OtterSpace SDK is a Go package for interacting with the OtterSpace API. It p To install the OtterSpace SDK, you can use `go get`: ```shell -go get git.anthrove.art/Anthrove/otter-space-sdk/v3 +go get git.anthrove.art/Anthrove/otter-space-sdk/v4 ```` ## Usage @@ -34,8 +34,8 @@ package main import ( "context" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/database" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/database" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" ) func main() { diff --git a/go.mod b/go.mod index 2206750..8185c56 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.anthrove.art/Anthrove/otter-space-sdk/v3 +module git.anthrove.art/Anthrove/otter-space-sdk/v4 go 1.22.0 diff --git a/pkg/database/client.go b/pkg/database/client.go index 9e28766..0a58ff5 100644 --- a/pkg/database/client.go +++ b/pkg/database/client.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/internal/utils" - otterError "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/error" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/internal/utils" + otterError "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/error" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" migrate "github.com/rubenv/sql-migrate" log "github.com/sirupsen/logrus" "go.opentelemetry.io/contrib/bridges/otellogrus" @@ -18,7 +18,7 @@ import ( "gorm.io/gorm" ) -const tracingName = "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/database" +const tracingName = "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/database" var ( //go:embed migrations/*.sql diff --git a/pkg/database/client_test.go b/pkg/database/client_test.go index 3f63553..c989c27 100644 --- a/pkg/database/client_test.go +++ b/pkg/database/client_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/test" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/test" "go.opentelemetry.io/contrib/bridges/otellogrus" "go.opentelemetry.io/otel" "gorm.io/gorm" diff --git a/pkg/database/favorite.go b/pkg/database/favorite.go index 661f842..27384ac 100644 --- a/pkg/database/favorite.go +++ b/pkg/database/favorite.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/internal/utils" - otterError "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/error" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/internal/utils" + otterError "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/error" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" log "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/attribute" "gorm.io/gorm" diff --git a/pkg/database/favorite_test.go b/pkg/database/favorite_test.go index d6885a9..6d5efe7 100644 --- a/pkg/database/favorite_test.go +++ b/pkg/database/favorite_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/test" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/test" "go.opentelemetry.io/contrib/bridges/otellogrus" "go.opentelemetry.io/otel" "gorm.io/gorm" diff --git a/pkg/database/post.go b/pkg/database/post.go index c2873f9..1e0eefa 100644 --- a/pkg/database/post.go +++ b/pkg/database/post.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/internal/utils" - otterError "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/error" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/internal/utils" + otterError "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/error" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" log "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/attribute" "gorm.io/gorm" diff --git a/pkg/database/post_test.go b/pkg/database/post_test.go index 68977e6..13c0394 100644 --- a/pkg/database/post_test.go +++ b/pkg/database/post_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/test" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/test" "go.opentelemetry.io/contrib/bridges/otellogrus" "go.opentelemetry.io/otel" "gorm.io/gorm" diff --git a/pkg/database/scopes.go b/pkg/database/scopes.go index 958d1a3..152038f 100644 --- a/pkg/database/scopes.go +++ b/pkg/database/scopes.go @@ -3,7 +3,7 @@ package database import ( "math" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" "gorm.io/gorm" ) diff --git a/pkg/database/scopes_test.go b/pkg/database/scopes_test.go index 8a42d9d..3a52b57 100644 --- a/pkg/database/scopes_test.go +++ b/pkg/database/scopes_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/test" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/test" "go.opentelemetry.io/contrib/bridges/otellogrus" "go.opentelemetry.io/otel" "gorm.io/gorm" diff --git a/pkg/database/source.go b/pkg/database/source.go index 5dda285..5c82cc3 100644 --- a/pkg/database/source.go +++ b/pkg/database/source.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/internal/utils" - otterError "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/error" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/internal/utils" + otterError "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/error" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" log "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/attribute" "gorm.io/gorm" diff --git a/pkg/database/source_test.go b/pkg/database/source_test.go index d99f036..bde458c 100644 --- a/pkg/database/source_test.go +++ b/pkg/database/source_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/test" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/test" "go.opentelemetry.io/contrib/bridges/otellogrus" "go.opentelemetry.io/otel" "gorm.io/gorm" diff --git a/pkg/database/tag.go b/pkg/database/tag.go index 25d13fd..1c558e8 100644 --- a/pkg/database/tag.go +++ b/pkg/database/tag.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/internal/utils" - otterError "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/error" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/internal/utils" + otterError "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/error" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" log "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/attribute" "gorm.io/gorm" diff --git a/pkg/database/tagAlias.go b/pkg/database/tagAlias.go index 10f643f..be89ad9 100644 --- a/pkg/database/tagAlias.go +++ b/pkg/database/tagAlias.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/internal/utils" - otterError "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/error" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/internal/utils" + otterError "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/error" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" log "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/attribute" "gorm.io/gorm" diff --git a/pkg/database/tagAlias_test.go b/pkg/database/tagAlias_test.go index e5bd1eb..104d367 100644 --- a/pkg/database/tagAlias_test.go +++ b/pkg/database/tagAlias_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/test" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/test" "go.opentelemetry.io/contrib/bridges/otellogrus" "go.opentelemetry.io/otel" ) diff --git a/pkg/database/tagGroup.go b/pkg/database/tagGroup.go index ef4dca2..4b7e13a 100644 --- a/pkg/database/tagGroup.go +++ b/pkg/database/tagGroup.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/internal/utils" - otterError "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/error" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/internal/utils" + otterError "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/error" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" log "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/attribute" "gorm.io/gorm" diff --git a/pkg/database/tagGroup_test.go b/pkg/database/tagGroup_test.go index 8d087a4..9a77a92 100644 --- a/pkg/database/tagGroup_test.go +++ b/pkg/database/tagGroup_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/test" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/test" "go.opentelemetry.io/contrib/bridges/otellogrus" "go.opentelemetry.io/otel" ) diff --git a/pkg/database/tag_test.go b/pkg/database/tag_test.go index 0c36ff6..395f554 100644 --- a/pkg/database/tag_test.go +++ b/pkg/database/tag_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/test" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/test" "go.opentelemetry.io/contrib/bridges/otellogrus" "go.opentelemetry.io/otel" ) diff --git a/pkg/database/user.go b/pkg/database/user.go index b6e2b69..db8d82e 100644 --- a/pkg/database/user.go +++ b/pkg/database/user.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/internal/utils" - otterError "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/error" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/internal/utils" + otterError "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/error" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" log "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/attribute" "gorm.io/gorm" diff --git a/pkg/database/userSource.go b/pkg/database/userSource.go index c21c712..6338ee4 100644 --- a/pkg/database/userSource.go +++ b/pkg/database/userSource.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/internal/utils" - otterError "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/error" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/internal/utils" + otterError "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/error" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" log "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/attribute" "gorm.io/gorm" diff --git a/pkg/database/userSource_test.go b/pkg/database/userSource_test.go index 4a4b192..e0f9f30 100644 --- a/pkg/database/userSource_test.go +++ b/pkg/database/userSource_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/test" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/test" "go.opentelemetry.io/contrib/bridges/otellogrus" "go.opentelemetry.io/otel" "gorm.io/gorm" diff --git a/pkg/database/user_test.go b/pkg/database/user_test.go index 2affc6b..85fe814 100644 --- a/pkg/database/user_test.go +++ b/pkg/database/user_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/test" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/test" "go.opentelemetry.io/contrib/bridges/otellogrus" "go.opentelemetry.io/otel" ) diff --git a/test/generator.go b/test/generator.go index d6aee26..d000f9d 100644 --- a/test/generator.go +++ b/test/generator.go @@ -5,7 +5,7 @@ import ( "math/rand" "time" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" "github.com/davecgh/go-spew/spew" gonanoid "github.com/matoous/go-nanoid/v2" "gorm.io/gorm" diff --git a/test/helper.go b/test/helper.go index 4d31273..49155fa 100644 --- a/test/helper.go +++ b/test/helper.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "git.anthrove.art/Anthrove/otter-space-sdk/v3/pkg/models" + "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/models" migrate "github.com/rubenv/sql-migrate" postgrescontainer "github.com/testcontainers/testcontainers-go/modules/postgres" "gorm.io/driver/postgres" -- 2.45.2 From abe553e165057d5bb1f6e7a6f0c154f98833e41a Mon Sep 17 00:00:00 2001 From: SoXX Date: Thu, 29 Aug 2024 15:18:10 +0200 Subject: [PATCH 3/4] chore(database): Remove unused function --- pkg/database/client.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/database/client.go b/pkg/database/client.go index 0a58ff5..1fadda5 100644 --- a/pkg/database/client.go +++ b/pkg/database/client.go @@ -4,7 +4,6 @@ import ( "context" "embed" "fmt" - "time" "git.anthrove.art/Anthrove/otter-space-sdk/v4/internal/utils" otterError "git.anthrove.art/Anthrove/otter-space-sdk/v4/pkg/error" @@ -66,9 +65,6 @@ func Connect(ctx context.Context, config models.DatabaseConfig) error { dsn := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=%s TimeZone=%s", config.Endpoint, config.Username, config.Password, config.Database, config.Port, localSSL, config.Timezone) sqlDB, err := gorm.Open(postgres.Open(dsn), &gorm.Config{ TranslateError: true, - NowFunc: func() time.Time { - return time.Now().UTC() - }, }) if err != nil { return utils.HandleError(ctx, span, localLogger, err) -- 2.45.2 From e5b8457f4284eba25a06bce00bed9e99a7e10c6a Mon Sep 17 00:00:00 2001 From: SoXX Date: Thu, 29 Aug 2024 15:18:23 +0200 Subject: [PATCH 4/4] feat(database): set timezone in migrations --- pkg/database/migrations/001_inital_database.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/database/migrations/001_inital_database.sql b/pkg/database/migrations/001_inital_database.sql index ce6e908..68749d7 100644 --- a/pkg/database/migrations/001_inital_database.sql +++ b/pkg/database/migrations/001_inital_database.sql @@ -91,7 +91,7 @@ CREATE TABLE "UserSource" scrape_time_interval TEXT, account_username TEXT, account_id TEXT, - last_scrape_time TIMESTAMP, + last_scrape_time TIMESTAMP WITH TIME ZONE, account_validate BOOL DEFAULT FALSE, account_validation_key CHAR(25), UNIQUE (source_id, account_username, account_id) -- 2.45.2