JohnCosta27/Haystack
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

refactor(text,tags,links): to foreign key to image instead of user_image

Browse Source
This commit is contained in:
John Costa
2025-03-18 17:48:38 +00:00
parent fd804ae515
commit b09063f74a
14 changed files with 510 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/models/image.go
View File

@@ -122,7 +122,11 @@ func (m ImageModel) FinishProcessing(ctx context.Context, imageId uuid.UUID) (mo
WHERE(UserImagesToProcess.ID.EQ(UUID(imageToProcess.ID)))
_, err = removeProcessingStmt.ExecContext(ctx, tx)
if err != nil {
return model.UserImages{}, err
}
err = tx.Commit()
return userImage, err
}

29
backend/models/locations.go Normal file
View File

@@ -0,0 +1,29 @@
package models
import (
"context"
"database/sql"
"screenmark/screenmark/.gen/haystack/haystack/model"
. "screenmark/screenmark/.gen/haystack/haystack/table"
)
type LocationModel struct {
dbPool *sql.DB
}
func (m LocationModel) Save(ctx context.Context, location model.Locations) (model.Locations, error) {
insertLocationStmt := Locations.
INSERT(Locations.Name, Locations.Address, Locations.Coordinates, Locations.Description).
VALUES(location.Name, location.Address, location.Coordinates, location.Description).
RETURNING(Locations.AllColumns)
insertedLocation := model.Locations{}
err := insertLocationStmt.QueryContext(ctx, m.dbPool, &insertLocationStmt)
return insertedLocation, err
}
func NewLocationModel(db *sql.DB) LocationModel {
return LocationModel{dbPool: db}
}

22
backend/models/user.go
View File

@@ -5,6 +5,7 @@ import (
"database/sql"
"errors"
"fmt"
"log"
"screenmark/screenmark/.gen/haystack/haystack/model"
. "screenmark/screenmark/.gen/haystack/haystack/table"
@@ -27,22 +28,26 @@ type ImageWithProperties struct {
}
Links []model.ImageLinks
Text []model.ImageText
Locations []model.Locations
}
func getUserIdFromImage(ctx context.Context, dbPool *sql.DB, imageId uuid.UUID) (uuid.UUID, error) {
getUserIdStmt := UserImages.SELECT(UserImages.UserID).WHERE(UserImages.ID.EQ(UUID(imageId)))
getUserIdStmt := UserImages.SELECT(UserImages.UserID).WHERE(UserImages.ImageID.EQ(UUID(imageId)))
user := []model.Users{}
err := getUserIdStmt.QueryContext(ctx, dbPool, &user)
log.Println(getUserIdStmt.DebugSql())
userImages := []model.UserImages{}
err := getUserIdStmt.QueryContext(ctx, dbPool, &userImages)
if err != nil {
return uuid.Nil, err
}
if len(user) != 1 {
if len(userImages) != 1 {
return uuid.Nil, errors.New("Expected exactly one choice.")
}
return user[0].ID, nil
return userImages[0].UserID, nil
}
func (m UserModel) ListWithProperties(ctx context.Context, userId uuid.UUID) ([]ImageWithProperties, error) {
@@ -56,10 +61,11 @@ func (m UserModel) ListWithProperties(ctx context.Context, userId uuid.UUID) ([]
ImageLinks.AllColumns).
FROM(
UserImages.INNER_JOIN(Image, Image.ID.EQ(UserImages.ImageID)).
LEFT_JOIN(ImageTags, ImageTags.ImageID.EQ(UserImages.ID)).
LEFT_JOIN(ImageTags, ImageTags.ImageID.EQ(Image.ID)).
INNER_JOIN(UserTags, UserTags.ID.EQ(ImageTags.TagID)).
LEFT_JOIN(ImageText, ImageText.ImageID.EQ(UserImages.ID)).
LEFT_JOIN(ImageLinks, ImageLinks.ImageID.EQ(UserImages.ID))).
LEFT_JOIN(ImageText, ImageText.ImageID.EQ(Image.ID)).
LEFT_JOIN(ImageLinks, ImageLinks.ImageID.EQ(Image.ID)).
LEFT_JOIN(ImageLocations, ImageLocations.ImageID.EQ(Image.ID))).
WHERE(UserImages.UserID.EQ(UUID(userId)))
fmt.Println(listWithPropertiesStmt.DebugSql())