feat(database): new fields

Signed-off-by: SoXX <soxx@fenpa.ws>

internal/postgres/user.go

@@ -6,6 +6,7 @@ import (
 
 	otterError "git.dragse.it/anthrove/otter-space-sdk/pkg/error"
 	"git.dragse.it/anthrove/otter-space-sdk/pkg/models"
+	gonanoid "github.com/matoous/go-nanoid/v2"
 	log "github.com/sirupsen/logrus"
 	"gorm.io/gorm"
 )
@@ -56,15 +57,21 @@ func CreateUserWithRelationToSource(ctx context.Context, db *gorm.DB, anthroveUs
 		return &otterError.EntityValidationFailed{Reason: "accountUsername cannot be empty"}
 	}
 
+	validationCode, err := gonanoid.New(25)
+
+	if err != nil {
+		return err
+	}
+
 	result := db.WithContext(ctx).Exec(`WITH userObj AS (
 			INSERT INTO "User" (id)
 			VALUES ($1)
 			ON CONFLICT (id) DO NOTHING
 		)
-		INSERT INTO "UserSource" (user_id, source_id, account_username, account_id)
+		INSERT INTO "UserSource" (user_id, source_id, account_username, account_id, account_validate, account_validation_key)
-		SELECT $2, source.id, $3, $4
+		SELECT $2, source.id, $3, $4, false, $5
 		FROM "Source" AS source
-		WHERE source.id = $5;`, anthroveUserID, anthroveUserID, accountUsername, accountId, sourceID)
+		WHERE source.id = $6;`, anthroveUserID, anthroveUserID, accountUsername, accountId, validationCode, sourceID)
 
 	if result.Error != nil {
 		if errors.Is(result.Error, gorm.ErrDuplicatedKey) {

pkg/database/database.go

@@ -2,6 +2,7 @@ package database
 
 import (
 	"context"
+
 	"git.dragse.it/anthrove/otter-space-sdk/pkg/models"
 )
 
@@ -76,5 +77,8 @@ type OtterSpace interface {
 	CreateTagGroup(ctx context.Context, tagGroupName models.AnthroveTagGroupName, tagID models.AnthroveTagID)
 	DeleteTagGroup(ctx context.Context, tagGroupName models.AnthroveTagGroupName) error
 
-	UpdateUserWithScrapeTimeInterval(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, scrapeTime models.AnthroveScrapeTimeInterval) error
+	UpdateUserSourceScrapeTimeInterval(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, scrapeTime models.AnthroveScrapeTimeInterval) error
+	UpdateUserSourceLastScrapeTime(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, lastScrapeTime models.AnthroveUserLastScrapeTime) error
+
+	UpdateUserSourceValidation(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, valid bool) error
 }

pkg/database/migrations/001_inital_database.sql

@@ -27,7 +27,7 @@ CREATE TABLE "Post"
 
 CREATE TABLE "Source"
 (
-    id CHAR(25) PRIMARY KEY,
+    id           CHAR(25) PRIMARY KEY,
     display_name TEXT NULL,
     icon         TEXT NULL,
     domain       TEXT NOT NULL UNIQUE,
@@ -89,11 +89,14 @@ CREATE TABLE "UserFavorites"
 
 CREATE TABLE "UserSource"
 (
-    user_id              TEXT REFERENCES "User" (id),
+    user_id                TEXT REFERENCES "User" (id),
-    source_id            TEXT REFERENCES "Source" (id),
+    source_id              TEXT REFERENCES "Source" (id),
-    scrape_time_interval TEXT,
+    scrape_time_interval   INT,
-    account_username     TEXT,
+    account_username       TEXT,
-    account_id           TEXT,
+    account_id             TEXT,
+    last_scrape_time       TIMESTAMP,
+    account_validate       BOOL DEFAULT FALSE,
+    account_validation_key CHAR(25),
     PRIMARY KEY (user_id, source_id),
     UNIQUE (source_id, account_username, account_id)
 );
@@ -103,17 +106,4 @@ CREATE TABLE "post_tags"
     post_id  TEXT REFERENCES "Post" (id),
     tag_name TEXT REFERENCES "Tag" (name),
     PRIMARY KEY (post_id, tag_name)
-);
+);
-
--- +migrate Down
-DROP TYPE Rating;
-DROP TYPE TagType;
-DROP TABLE Post;
-DROP TABLE Source;
-DROP TABLE Tag;
-DROP TABLE User;
-DROP TABLE PostReference;
-DROP TABLE TagAlias;
-DROP TABLE TagGroup;
-DROP TABLE UserFavorites;
-DROP TABLE UserSource;

pkg/database/postgres.go

@@ -193,6 +193,21 @@ func (p *postgresqlConnection) UpdateUserWithScrapeTimeInterval(ctx context.Cont
 	panic("implement me")
 }
 
+func (p *postgresqlConnection) UpdateUserSourceScrapeTimeInterval(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, scrapeTime models.AnthroveScrapeTimeInterval) error {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (p *postgresqlConnection) UpdateUserSourceLastScrapeTime(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, lastScrapeTime models.AnthroveUserLastScrapeTime) error {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (p *postgresqlConnection) UpdateUserSourceValidation(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, valid bool) error {
+	//TODO implement me
+	panic("implement me")
+}
+
 func (p *postgresqlConnection) migrateDatabase(dbPool *gorm.DB) error {
 	dialect := "postgres"
 	migrations := &migrate.EmbedFileSystemMigrationSource{FileSystem: embedMigrations, Root: "migrations"}

pkg/models/const.go

@@ -1,7 +1,5 @@
 package models
 
-import "google.golang.org/genproto/googleapis/type/date"
-
 type AnthroveUserID string
 type AnthrovePostID string
 type AnthroveSourceID string
@@ -10,7 +8,8 @@ type AnthrovePostURL string
 type AnthroveTagGroupName string
 type AnthroveTagAliasName string
 type AnthroveTagID string
-type AnthroveScrapeTimeInterval date.Date
+type AnthroveScrapeTimeInterval int
+type AnthroveUserLastScrapeTime int
 
 type Rating string
 type TagType string

pkg/models/userSource.go

@@ -1,13 +1,18 @@
 package models
 
+import "time"
+
 type UserSource struct {
-	User               User   `gorm:"foreignKey:ID;references:UserID"`
+	User                 User   `gorm:"foreignKey:ID;references:UserID"`
-	UserID             string `gorm:"primaryKey"`
+	UserID               string `gorm:"primaryKey"`
-	Source             Source `gorm:"foreignKey:ID;references:SourceID"`
+	Source               Source `gorm:"foreignKey:ID;references:SourceID"`
-	SourceID           string `gorm:"primaryKey"`
+	SourceID             string `gorm:"primaryKey"`
-	ScrapeTimeInterval string
+	ScrapeTimeInterval   string
-	AccountUsername    string
+	AccountUsername      string
-	AccountID          string
+	AccountID            string
+	LastScrapeTime       time.Time
+	AccountValidate      bool
+	AccountValidationKey string
 }
 
 func (UserSource) TableName() string {