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

feat(notes): allowing frontend to save

Browse Source
This commit is contained in:
John Costa
2025-04-01 20:54:15 +00:00
parent a385ef21cf
commit 393eaea2f4
5 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
backend/main.go
View File

@@ -110,7 +110,7 @@ func main() {
panic(err)
}
_, err = agents.NewLocationEventAgent(locationModel, eventModel, contactModel)
locationAgent, err := agents.NewLocationEventAgent(locationModel, eventModel, contactModel)
if err != nil {
panic(err)
}
@@ -134,9 +134,11 @@ func main() {
return
}
// log.Println("Calling locationAgent!")
// err = locationAgent.GetLocations(image.UserID, image.ImageID, image.Image.ImageName, image.Image.Image)
// log.Println(err)
// TODO: this can very much be parallel
log.Println("Calling locationAgent!")
err = locationAgent.GetLocations(image.UserID, image.ImageID, image.Image.ImageName, image.Image.Image)
log.Println(err)
log.Println("Calling noteAgent!")
err = noteAgent.GetNotes(image.UserID, image.ImageID, image.Image.ImageName, image.Image.Image)
@@ -230,6 +232,13 @@ func main() {
Data: event,
})
}
for _, note := range image.Notes {
dataTypes = append(dataTypes, DataType{
Type: "note",
Data: note,
})
}
}
jsonImages, err := json.Marshal(dataTypes)

8
backend/models/user.go
View File

@@ -37,6 +37,8 @@ type ImageWithProperties struct {
Location *model.Locations
Organizer *model.Contacts
}
Notes []model.Notes
}
func getUserIdFromImage(ctx context.Context, dbPool *sql.DB, imageId uuid.UUID) (uuid.UUID, error) {
@@ -72,6 +74,8 @@ func (m UserModel) ListWithProperties(ctx context.Context, userId uuid.UUID) ([]
Events.AllColumns,
ImageContacts.AllColumns,
Contacts.AllColumns,
ImageNotes.AllColumns,
Notes.AllColumns,
).
FROM(
UserImages.INNER_JOIN(Image, Image.ID.EQ(UserImages.ImageID)).
@@ -84,7 +88,9 @@ func (m UserModel) ListWithProperties(ctx context.Context, userId uuid.UUID) ([]
LEFT_JOIN(ImageEvents, ImageEvents.ImageID.EQ(UserImages.ImageID)).
LEFT_JOIN(Events, Events.ID.EQ(ImageEvents.EventID)).
LEFT_JOIN(ImageContacts, ImageContacts.ImageID.EQ(UserImages.ImageID)).
LEFT_JOIN(Contacts, Contacts.ID.EQ(ImageContacts.ContactID))).
LEFT_JOIN(Contacts, Contacts.ID.EQ(ImageContacts.ContactID)).
LEFT_JOIN(ImageNotes, ImageNotes.ImageID.EQ(UserImages.ImageID)).
LEFT_JOIN(Notes, Notes.ID.EQ(ImageNotes.NoteID))).
WHERE(UserImages.UserID.EQ(UUID(userId)))
fmt.Println(listWithPropertiesStmt.DebugSql())