From 254edf3421736df1dd920d8c31ca79064b3cdcba Mon Sep 17 00:00:00 2001
From: John Costa <johncosta027@gmail.com>
Date: Wed, 26 Mar 2025 16:51:46 +0000
Subject: [PATCH] fix(backend): SQL statements without returns

---
 backend/main.go             | 39 ++++++++++++++++++++++++-------------
 backend/models/events.go    |  6 +++---
 backend/models/locations.go |  3 ++-
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/backend/main.go b/backend/main.go
index 99f1263..e2b3d84 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -129,7 +129,6 @@ func main() {
 
 					log.Println("Calling locationAgent!")
 					err = locationAgent.GetLocations(image.UserID, image.ImageID, image.Image.ImageName, image.Image.Image)
-
 					log.Println(err)
 
 					return
@@ -141,11 +140,6 @@ func main() {
 						return
 					}
 
-					log.Println("-----")
-					log.Println(imageInfo)
-
-					log.Println(userImage)
-
 					err = tagModel.SaveToImage(ctx, userImage.ImageID, imageInfo.Tags)
 					if err != nil {
 						log.Println("Failed to save tags")
@@ -166,13 +160,6 @@ func main() {
 						log.Println(err)
 						return
 					}
-
-					// err = eventModel.SaveToImage(ctx, userImage.ImageID, imageInfo.Events)
-					// if err != nil {
-					// 	log.Println("Failed to save events")
-					// 	log.Println(err)
-					// 	return
-					// }
 				}()
 			}
 		}
@@ -210,7 +197,31 @@ func main() {
 			return
 		}
 
-		jsonImages, err := json.Marshal(images)
+		log.Println(images)
+
+		type DataType struct {
+			Type string `json:"type"`
+			Data any    `json:"data"`
+		}
+
+		dataTypes := make([]DataType, 0)
+		for _, image := range images {
+			for _, location := range image.Locations {
+				dataTypes = append(dataTypes, DataType{
+					Type: "location",
+					Data: location,
+				})
+			}
+
+			for _, event := range image.Events {
+				dataTypes = append(dataTypes, DataType{
+					Type: "event",
+					Data: event,
+				})
+			}
+		}
+
+		jsonImages, err := json.Marshal(dataTypes)
 		if err != nil {
 			log.Println(err)
 			w.WriteHeader(http.StatusBadRequest)
diff --git a/backend/models/events.go b/backend/models/events.go
index 8167f8e..a233d61 100644
--- a/backend/models/events.go
+++ b/backend/models/events.go
@@ -30,8 +30,7 @@ func (m EventModel) Save(ctx context.Context, userId uuid.UUID, event model.Even
 
 	insertUserEventStmt := UserEvents.
 		INSERT(UserEvents.UserID, UserEvents.EventID).
-		VALUES(userId, insertedEvent.ID).
-		RETURNING(UserEvents.AllColumns)
+		VALUES(userId, insertedEvent.ID)
 
 	_, err = insertUserEventStmt.ExecContext(ctx, m.dbPool)
 
@@ -41,7 +40,8 @@ func (m EventModel) Save(ctx context.Context, userId uuid.UUID, event model.Even
 func (m EventModel) SaveToImage(ctx context.Context, imageId uuid.UUID, eventId uuid.UUID) (model.ImageEvents, error) {
 	insertImageEventStmt := ImageEvents.
 		INSERT(ImageEvents.ImageID, ImageEvents.EventID).
-		VALUES(imageId, eventId)
+		VALUES(imageId, eventId).
+		RETURNING(ImageEvents.AllColumns)
 
 	imageEvent := model.ImageEvents{}
 	err := insertImageEventStmt.QueryContext(ctx, m.dbPool, &imageEvent)
diff --git a/backend/models/locations.go b/backend/models/locations.go
index c26148d..c419740 100644
--- a/backend/models/locations.go
+++ b/backend/models/locations.go
@@ -53,7 +53,8 @@ func (m LocationModel) Save(ctx context.Context, userId uuid.UUID, location mode
 func (m LocationModel) SaveToImage(ctx context.Context, imageId uuid.UUID, locationId uuid.UUID) (model.ImageLocations, error) {
 	insertImageLocationStmt := ImageLocations.
 		INSERT(ImageLocations.ImageID, ImageLocations.LocationID).
-		VALUES(imageId, locationId)
+		VALUES(imageId, locationId).
+		RETURNING(ImageLocations.AllColumns)
 
 	imageLocation := model.ImageLocations{}
 	err := insertImageLocationStmt.QueryContext(ctx, m.dbPool, &imageLocation)