feat: allowing user to get a list of their images

feat: UI to show and organise user images

backend/main.go

@@ -70,6 +70,42 @@ func main() {
 		w.WriteHeader(http.StatusOK)
 	})
 
+	// Temporarily not in protect route because we aren't using cookies.
+	// Therefore they don't get automatically attached to the request.
+	// So <img src=""> cannot send the tokensend the token
+	r.Get("/image/{id}", func(w http.ResponseWriter, r *http.Request) {
+		stringImageId := r.PathValue("id")
+		// userId := r.Context().Value(USER_ID).(uuid.UUID)
+
+		imageId, err := uuid.Parse(stringImageId)
+		if err != nil {
+			w.WriteHeader(http.StatusForbidden)
+			fmt.Fprintf(w, "You cannot read this")
+			return
+		}
+
+		// if authorized := imageModel.IsUserAuthorized(r.Context(), imageId, userId); !authorized {
+		// 	w.WriteHeader(http.StatusForbidden)
+		// 	fmt.Fprintf(w, "You cannot read this")
+		// 	return
+		// }
+
+		image, err := imageModel.Get(r.Context(), imageId)
+		if err != nil {
+			log.Println(err)
+			w.WriteHeader(http.StatusNotFound)
+			fmt.Fprintf(w, "Could not get image")
+			return
+		}
+
+		// TODO: this could be part of the db table
+		extension := filepath.Ext(image.ImageName)
+		extension = extension[1:]
+
+		w.Header().Add("Content-Type", "image/"+extension)
+		w.Write(image.Image)
+	})
+
 	r.Group(func(r chi.Router) {
 		r.Use(ProtectedRoute)
 
@@ -81,7 +117,7 @@ func main() {
 				return
 			}
 
-			images, err := userModel.ListWithProperties(r.Context(), userId)
+			imageProperties, err := userModel.ListWithProperties(r.Context(), userId)
 			if err != nil {
 				log.Println(err)
 				w.WriteHeader(http.StatusNotFound)
@@ -89,7 +125,25 @@ func main() {
 				return
 			}
 
-			jsonImages, err := json.Marshal(models.GetTypedImageProperties(images))
+			images, err := userModel.GetUserImages(r.Context(), userId)
+			if err != nil {
+				log.Println(err)
+				w.WriteHeader(http.StatusNotFound)
+				fmt.Fprintf(w, "Something went wrong")
+				return
+			}
+
+			type ImagesReturn struct {
+				UserImages      []models.UserImageWithImage
+				ImageProperties []models.TypedProperties
+			}
+
+			imagesReturn := ImagesReturn{
+				UserImages:      images,
+				ImageProperties: models.GetTypedImageProperties(imageProperties),
+			}
+
+			jsonImages, err := json.Marshal(imagesReturn)
 			if err != nil {
 				log.Println(err)
 				w.WriteHeader(http.StatusBadRequest)
@@ -130,40 +184,6 @@ func main() {
 			w.Write(jsonImages)
 		})
 
-		r.Get("/image/{id}", func(w http.ResponseWriter, r *http.Request) {
-			stringImageId := r.PathValue("id")
-			userId := r.Context().Value(USER_ID).(uuid.UUID)
-
-			imageId, err := uuid.Parse(stringImageId)
-			if err != nil {
-				w.WriteHeader(http.StatusForbidden)
-				fmt.Fprintf(w, "You cannot read this")
-				return
-			}
-
-			if authorized := imageModel.IsUserAuthorized(r.Context(), imageId, userId); !authorized {
-				w.WriteHeader(http.StatusForbidden)
-				fmt.Fprintf(w, "You cannot read this")
-				return
-			}
-
-			// TODO: really need authorization here!
-			image, err := imageModel.Get(r.Context(), imageId)
-			if err != nil {
-				log.Println(err)
-				w.WriteHeader(http.StatusNotFound)
-				fmt.Fprintf(w, "Could not get image")
-				return
-			}
-
-			// TODO: this could be part of the db table
-			extension := filepath.Ext(image.Image.ImageName)
-			extension = extension[1:]
-
-			w.Header().Add("Content-Type", "image/"+extension)
-			w.Write(image.Image.Image)
-		})
-
 		r.Post("/image/{name}", func(w http.ResponseWriter, r *http.Request) {
 			imageName := r.PathValue("name")
 			userId := r.Context().Value(USER_ID).(uuid.UUID)

backend/models/image.go

@@ -154,21 +154,14 @@ func (m ImageModel) StartProcessing(ctx context.Context, processingImageId uuid.
 	return err
 }
 
-func (m ImageModel) Get(ctx context.Context, imageId uuid.UUID) (ImageData, error) {
-	getImageStmt := SELECT(UserImages.AllColumns, Image.AllColumns).
-		FROM(
-			UserImages.INNER_JOIN(Image, Image.ID.EQ(UserImages.ImageID)),
-		).
-		WHERE(UserImages.ID.EQ(UUID(imageId)))
+func (m ImageModel) Get(ctx context.Context, imageId uuid.UUID) (model.Image, error) {
+	getImageStmt := Image.SELECT(Image.AllColumns).
+		WHERE(Image.ID.EQ(UUID(imageId)))
 
-	images := []ImageData{}
-	err := getImageStmt.QueryContext(ctx, m.dbPool, &images)
+	image := model.Image{}
+	err := getImageStmt.QueryContext(ctx, m.dbPool, &image)
 
-	if len(images) != 1 {
-		return ImageData{}, errors.New(fmt.Sprintf("Expected 1, got %d\n", len(images)))
-	}
-
-	return images[0], err
+	return image, err
 }
 
 func (m ImageModel) IsUserAuthorized(ctx context.Context, imageId uuid.UUID, userId uuid.UUID) bool {

backend/models/user.go

@@ -295,6 +295,27 @@ func (m UserModel) Save(ctx context.Context, user model.Users) (model.Users, err
 	return insertedUser, err
 }
 
+type UserImageWithImage struct {
+	model.UserImages
+
+	Image model.Image
+}
+
+func (m UserModel) GetUserImages(ctx context.Context, userId uuid.UUID) ([]UserImageWithImage, error) {
+	getUserImagesStmt := SELECT(
+		UserImages.AllColumns,
+		Image.ID,
+		Image.ImageName,
+	).
+		FROM(UserImages.INNER_JOIN(Image, Image.ID.EQ(UserImages.ImageID))).
+		WHERE(UserImages.UserID.EQ(UUID(userId)))
+
+	userImages := []UserImageWithImage{}
+	err := getUserImagesStmt.QueryContext(ctx, m.dbPool, &userImages)
+
+	return userImages, err
+}
+
 func NewUserModel(db *sql.DB) UserModel {
 	return UserModel{dbPool: db}
 }