fix: go:nextのクエリのこと分かってなかったため手戻り #149

shari-sushi · Mar 2, 2024 · b81c6d9 · b81c6d9
1 parent aa45208
commit b81c6d9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/t0016Go/infra/routing.go b/t0016Go/infra/routing.go
@@ -28,7 +28,7 @@ func Routing(r *gin.Engine) {
 		vcontents := ver.Group("/vcontents")
 		{
 			vcontents.GET("/", Controller.ReturnTopPageData)
-			vcontents.GET("/vtuber/:id", Controller.ReturnVtuberPageData)
+			vcontents.GET("/vtuber/:kana", Controller.ReturnVtuberPageData)
 			vcontents.GET("/sings", Controller.GetJoinVtubersMoviesKaraokes)
 			vcontents.GET("/original-song", Controller.ReturnOriginalSongPage)
 			// /vtuber, /movie, /karaokeの文字列はフロント側で比較演算に使われてる

diff --git a/t0016Go/interfaces/controllers/vtuber_content.go b/t0016Go/interfaces/controllers/vtuber_content.go
@@ -3,7 +3,6 @@ package controllers
 import (
 	"fmt"
 	"net/http"
-	"strconv"
 
 	"github.com/gin-gonic/gin"
 	"github.com/sharin-sushi/0016go_next_relation/domain"
@@ -35,23 +34,21 @@ func (controller *Controller) GetJoinVtubersMoviesKaraokes(c *gin.Context) {
 }
 
 func (controller *Controller) ReturnVtuberPageData(c *gin.Context) {
-	id, _ := strconv.Atoi((c.Param("id")))
-	vtuber_id := domain.VtuberId(id)
-	fmt.Println("id", vtuber_id)
+	kana := c.Param("kana")
+	fmt.Println("kana", kana)
 	var errs []error
 
-	MosOfVtu, err := controller.VtuberContentInteractor.GetMoviesUrlTitlebyVtuber(vtuber_id)
+	VtsMosKasWithFavofVtu, err := controller.FavoriteInteractor.GetVtubersMoviesKaraokesByVtuerKanaWithFavCnts(kana)
 	if err != nil {
 		fmt.Print("err:", err)
 		errs = append(errs, err)
 	}
-
-	VtsMosKasWithFavofVtu, err := controller.FavoriteInteractor.GetVtubersMoviesKaraokesByVtuerWithFavCnts(vtuber_id)
+	vtuberId := VtsMosKasWithFavofVtu[0].VtuberId
+	MosOfVtu, err := controller.VtuberContentInteractor.GetMoviesUrlTitlebyVtuber(vtuberId)
 	if err != nil {
 		fmt.Print("err:", err)
 		errs = append(errs, err)
 	}
-	////
 
 	listenerId, err := common.TakeListenerIdFromJWT(c) //非ログイン時でもデータは送付する
 	if err != nil || listenerId == 0 {

diff --git a/t0016Go/interfaces/database/favorite_db.go b/t0016Go/interfaces/database/favorite_db.go
@@ -107,7 +107,7 @@ func (db *FavoriteRepository) GetVtubersMoviesKaraokesWithFavCnts() ([]domain.Tr
 	return TmKas, nil
 }
 
-func (db *FavoriteRepository) GetVtubersMoviesKaraokesByVtuerWithFavCnts(id domain.VtuberId) ([]domain.TransmitKaraoke, error) {
+func (db *FavoriteRepository) GetVtubersMoviesKaraokesByVtuerKanaWithFavCnts(kana string) ([]domain.TransmitKaraoke, error) {
 	fmt.Print("interfaces/database/favorite.go \n")
 	var TmKas []domain.TransmitKaraoke
 	var err error
@@ -121,7 +121,7 @@ func (db *FavoriteRepository) GetVtubersMoviesKaraokesByVtuerWithFavCnts(id doma
 	joinQu2 := "LEFT JOIN karaokes as k ON m.movie_url = k.movie_url "
 	joinQu3 := "LEFT JOIN favorites as f ON k.karaoke_id = f.karaoke_id AND f.karaoke_id != 0  AND f.deleted_at IS NULL"
 	joinQu := fmt.Sprint(joinQu1, joinQu2, joinQu3)
-	whereQu := fmt.Sprintf("vtubers.vtuber_id = %v AND m.movie_url IS NOT NULL AND k.karaoke_id != 0 ", id)
+	whereQu := fmt.Sprintf("vtubers.vtuber_kana = \"%v\" AND m.movie_url IS NOT NULL AND k.karaoke_id != 0 ", kana)
 	groupQu := "k.karaoke_id"
 	err = db.Model(vt).Select(selectQu1, selectQu2, selectQu3, selectQu4).
 		Joins(joinQu).Where(whereQu).Group(groupQu).

diff --git a/t0016Go/useCase/favorite_interactor.go b/t0016Go/useCase/favorite_interactor.go
@@ -72,9 +72,9 @@ func (interactor *FavoriteInteractor) GetVtubersMoviesKaraokesWithFavCnts() ([]d
 	return VtsMosKasWitFav, err
 }
 
-func (interactor *FavoriteInteractor) GetVtubersMoviesKaraokesByVtuerWithFavCnts(id domain.VtuberId) ([]domain.TransmitKaraoke, error) {
+func (interactor *FavoriteInteractor) GetVtubersMoviesKaraokesByVtuerKanaWithFavCnts(kana string) ([]domain.TransmitKaraoke, error) {
 	fmt.Print("useCase/favorite_interactor.go \n")
-	VtsMosKasWitFav, err := interactor.FavoriteRepository.GetVtubersMoviesKaraokesByVtuerWithFavCnts(id)
+	VtsMosKasWitFav, err := interactor.FavoriteRepository.GetVtubersMoviesKaraokesByVtuerKanaWithFavCnts(kana)
 	return VtsMosKasWitFav, err
 }
 

diff --git a/t0016Go/useCase/repository.go b/t0016Go/useCase/repository.go
@@ -58,7 +58,7 @@ type FavoriteRepository interface {
 
 	GetVtubersMoviesWithFavCnts() ([]domain.TransmitMovie, error)           //
 	GetVtubersMoviesKaraokesWithFavCnts() ([]domain.TransmitKaraoke, error) //
-	GetVtubersMoviesKaraokesByVtuerWithFavCnts(domain.VtuberId) ([]domain.TransmitKaraoke, error)
+	GetVtubersMoviesKaraokesByVtuerKanaWithFavCnts(string) ([]domain.TransmitKaraoke, error)
 	GetLatest50VtubersMoviesKaraokesWithFavCnts(domain.ListenerId) ([]domain.TransmitKaraoke, error) //
 	// 以下、開発中
 	FindMoviesFavoritedByListenerId(domain.ListenerId) ([]domain.TransmitMovie, error)