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

feat: using struct to send notification and improved image model

Browse Source
This commit is contained in:
John Costa
2025-05-10 16:03:31 +01:00
parent 2f3d643278
commit 64439d9041
3 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
backend/events.go
View File

@ -15,7 +15,12 @@ import (
"github.com/lib/pq" "github.com/lib/pq"
) )
func ListenNewImageEvents(db *sql.DB, notifier *Notifier[string]) { type Notification struct {
ImageID uuid.UUID
Status string
}
func ListenNewImageEvents(db *sql.DB, notifier *Notifier[Notification]) {
listener := pq.NewListener(os.Getenv("DB_CONNECTION"), time.Second, time.Second, func(event pq.ListenerEventType, err error) { listener := pq.NewListener(os.Getenv("DB_CONNECTION"), time.Second, time.Second, func(event pq.ListenerEventType, err error) {
if err != nil { if err != nil {
panic(err) panic(err)
@ -79,7 +84,7 @@ func ListenNewImageEvents(db *sql.DB, notifier *Notifier[string]) {
} }
} }
func ListenProcessingImageStatus(db *sql.DB, notifier *Notifier[string]) { func ListenProcessingImageStatus(db *sql.DB, images models.ImageModel, notifier *Notifier[Notification]) {
listener := pq.NewListener(os.Getenv("DB_CONNECTION"), time.Second, time.Second, func(event pq.ListenerEventType, err error) { listener := pq.NewListener(os.Getenv("DB_CONNECTION"), time.Second, time.Second, func(event pq.ListenerEventType, err error) {
if err != nil { if err != nil {
panic(err) panic(err)
@ -105,22 +110,27 @@ func ListenProcessingImageStatus(db *sql.DB, notifier *Notifier[string]) {
continue continue
} }
userId, err := models.GetUserId(db, context.Background(), imageUuid) processingImage, err := images.GetToProcess(context.Background(), imageUuid)
if err != nil { if err != nil {
logger.Error("GetUserID failed", "err", err) logger.Error("GetToProcess failed", "err", err)
continue continue
} }
logger.Info("Update", "id", imageStringUuid, "status", status) logger.Info("Update", "id", imageStringUuid, "status", status)
if err := notifier.SendAndCreate(userId.String(), status); err != nil { notification := Notification{
ImageID: processingImage.ImageID,
Status: status,
}
if err := notifier.SendAndCreate(processingImage.UserID.String(), notification); err != nil {
logger.Error(err) logger.Error(err)
} }
} }
} }
} }
func CreateEventsHandler(notifier *Notifier[string]) http.HandlerFunc { func CreateEventsHandler(notifier *Notifier[Notification]) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
userId := r.Context().Value(USER_ID).(uuid.UUID) userId := r.Context().Value(USER_ID).(uuid.UUID)
if userId == uuid.Nil { if userId == uuid.Nil {

4
backend/main.go
View File

@ -48,10 +48,10 @@ func main() {
auth := CreateAuth(mail) auth := CreateAuth(mail)
notifier := NewNotifier[string](10) notifier := NewNotifier[Notification](10)
go ListenNewImageEvents(db, &notifier) go ListenNewImageEvents(db, &notifier)
go ListenProcessingImageStatus(db, &notifier) go ListenProcessingImageStatus(db, imageModel, &notifier)
r := chi.NewRouter() r := chi.NewRouter()

22
backend/models/image.go
View File

@ -180,28 +180,6 @@ func (m ImageModel) IsUserAuthorized(ctx context.Context, imageId uuid.UUID, use
return err != nil && userImage.UserID.String() == userId.String() return err != nil && userImage.UserID.String() == userId.String()
} }
func GetUserId(dbPool *sql.DB, ctx context.Context, imageId uuid.UUID) (uuid.UUID, error) {
getUserIdStmt := UserImagesToProcess.
SELECT(UserImagesToProcess.UserID).
WHERE(UserImagesToProcess.ID.EQ(UUID(imageId)))
userImage := model.UserImagesToProcess{}
err := getUserIdStmt.QueryContext(ctx, dbPool, &userImage)
return userImage.UserID, err
}
func GetUserIdComplete(dbPool *sql.DB, ctx context.Context, imageId uuid.UUID) (uuid.UUID, error) {
getUserIdStmt := UserImages.
SELECT(UserImages.UserID).
WHERE(UserImages.ID.EQ(UUID(imageId)))
userImage := model.UserImagesToProcess{}
err := getUserIdStmt.QueryContext(ctx, dbPool, &userImage)
return userImage.UserID, err
}
func NewImageModel(db *sql.DB) ImageModel { func NewImageModel(db *sql.DB) ImageModel {
return ImageModel{dbPool: db} return ImageModel{dbPool: db}
} }