marcorealacci/WASAPhoto
1
0
Fork 0
mirror of https://github.com/notherealmarco/WASAPhoto.git synced 2025-03-14 06:06:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix database query typo

Browse source
This commit is contained in:
Marco Realacci 2022-11-20 19:36:35 +01:00
parent abbd5bc494
commit 52ae7992b1
4 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
cmd/webapi/__debug_bin Executable file
View file

Binary file not shown.

5
service/api/api-handler.go
View file

@ -23,9 +23,14 @@ func (rt *_router) Handler() http.Handler {
rt.router.GET("/users/:user_id/photos/:photo_id", rt.wrap(rt.GetPhoto))
rt.router.DELETE("/users/:user_id/photos/:photo_id", rt.wrap(rt.DeletePhoto))
rt.router.GET("/users/:user_id/photos/:photo_id/likes", rt.wrap(rt.GetLikes))
rt.router.PUT("/users/:user_id/photos/:photo_id/likes/:liker_uid", rt.wrap(rt.PutDeleteLike))
rt.router.DELETE("/users/:user_id/photos/:photo_id/likes/:liker_uid", rt.wrap(rt.PutDeleteLike))
rt.router.GET("/users/:user_id/photos/:photo_id/comments", rt.wrap(rt.GetComments))
rt.router.POST("/users/:user_id/photos/:photo_id/comments", rt.wrap(rt.PostComment))
rt.router.DELETE("/users/:user_id/photos/:photo_id/comments/:comment_id", rt.wrap(rt.DeleteComment))
rt.router.GET("/", rt.getHelloWorld)
rt.router.GET("/context", rt.wrap(rt.getContextReply))

16
service/database/db-photos.go
View file

@ -99,12 +99,12 @@ func (db *appdbimpl) GetUserProfile(uid string) (*UserProfile, error) {
err = db.c.QueryRow(`SELECT COUNT(*) FROM "follows" WHERE "follower" = ?`, uid).Scan(&following)
// Get photos
rows, err := db.c.Query(`SELECT "photos.id", "photos.date",
COUNT("likes.user") AS "likes",
COUNT("comments.user") AS "comments"
rows, err := db.c.Query(`SELECT "photos"."id", "photos"."date",
COUNT("likes"."user") AS "likes",
COUNT("comments"."user") AS "comments"
FROM "photos", "likes", "comments"
WHERE "likes.photo_id" = "photos.id"
AND "comments.photo" = "photos.id"
WHERE "likes"."photo_id" = "photos"."id"
AND "comments"."photo" = "photos"."id"
AND "user" = ?`, uid)
if err != nil {
return nil, err
@ -151,9 +151,9 @@ func (db *appdbimpl) GetPhotoLikes(uid string, photo int64) (QueryResult, *[]str
return ERR_NOT_FOUND, nil, nil
}
rows, err := db.c.Query(`SELECT "users.uid", "users.name" FROM "likes", "users"
WHERE "likes.photo_id" = ?
AND "likes.user" = "users.uid"`, photo)
rows, err := db.c.Query(`SELECT "users"."uid", "users"."name" FROM "likes", "users"
WHERE "likes"."photo_id" = ?
AND "likes"."user" = "users"."uid"`, photo)
if err != nil {
return ERR_INTERNAL, nil, err
}

8
service/database/db-users.go
View file

@ -61,8 +61,8 @@ func (db *appdbimpl) GetUserFollowers(uid string) (QueryResult, *[]structures.UI
return ERR_NOT_FOUND, nil, nil
}
rows, err := db.c.Query(`SELECT "follower", "user.name" FROM "follows", "users"
WHERE "follows.follower" = "users.uid"
rows, err := db.c.Query(`SELECT "follower", "user"."name" FROM "follows", "users"
WHERE "follows"."follower" = "users"."uid"
AND "followed" = ?`, uid)
followers, err := db.uidNameQuery(rows, err)
@ -88,8 +88,8 @@ func (db *appdbimpl) GetUserFollowing(uid string) (QueryResult, *[]structures.UI
return ERR_NOT_FOUND, nil, nil
}
rows, err := db.c.Query(`SELECT "followed", "user.name" FROM "follows", "users"
WHERE "follows.followed" = "users.uid"
rows, err := db.c.Query(`SELECT "followed", "user"."name" FROM "follows", "users"
WHERE "follows"."followed" = "users"."uid"
AND "follower" = ?`, uid)
following, err := db.uidNameQuery(rows, err)