feat: GetUsertitles implemented

modules/backend/handlers/common.go

@@ -17,7 +17,24 @@ func NewServer(db *sqlc.Queries) Server {
 	return Server{db: db}
 }
 
-func (s Server) mapTitle(ctx context.Context, title sqlc.SearchTitlesRow) (oapi.Title, error) {
+func (s Server) mapTitle(ctx context.Context, title sqlc.GetTitleByIDRow) (oapi.Title, error) {
+
+	oapi_title := oapi.Title{
+		EpisodesAired: title.EpisodesAired,
+		EpisodesAll:   title.EpisodesAired,
+		// EpisodesLen:   &episodes_lens,
+		Id: title.ID,
+		// Poster:        &oapi_image,
+		Rating:      title.Rating,
+		RatingCount: title.RatingCount,
+		// ReleaseSeason: &release_season,
+		ReleaseYear: title.ReleaseYear,
+		// Studio:        &oapi_studio,
+		// Tags:          oapi_tag_names,
+		// TitleNames:    title_names,
+		// TitleStatus:   oapi_status,
+		// AdditionalProperties:
+	}
 
 	title_names := make(map[string][]string, 0)
 	err := json.Unmarshal(title.TitleNames, &title_names)
@@ -25,10 +42,13 @@ func (s Server) mapTitle(ctx context.Context, title sqlc.SearchTitlesRow) (oapi.
 		return oapi.Title{}, fmt.Errorf("unmarshal TitleNames: %v", err)
 	}
 
-	episodes_lens := make(map[string]float64, 0)
-	err = json.Unmarshal(title.EpisodesLen, &episodes_lens)
-	if err != nil {
-		return oapi.Title{}, fmt.Errorf("unmarshal EpisodesLen: %v", err)
+	if title.EpisodesLen != nil && len(title.EpisodesLen) > 0 {
+		episodes_lens := make(map[string]float64, 0)
+		err = json.Unmarshal(title.EpisodesLen, &episodes_lens)
+		if err != nil {
+			return oapi.Title{}, fmt.Errorf("unmarshal EpisodesLen: %v", err)
+		}
+		oapi_title.EpisodesLen = &episodes_lens
 	}
 
 	oapi_tag_names := make(oapi.Tags, 0)
@@ -38,17 +58,19 @@ func (s Server) mapTitle(ctx context.Context, title sqlc.SearchTitlesRow) (oapi.
 	}
 
 	var oapi_studio oapi.Studio
-
-	oapi_studio.Id = title.StudioID
 	if title.StudioName != nil {
 		oapi_studio.Name = *title.StudioName
 	}
-	oapi_studio.Description = title.StudioDesc
-	if title.StudioIllustID != nil {
-		oapi_studio.Poster.Id = title.StudioIllustID
-		oapi_studio.Poster.ImagePath = title.StudioImagePath
-		oapi_studio.Poster.StorageType = &title.StudioStorageType
+	if title.StudioID != 0 {
+		oapi_studio.Id = title.StudioID
+		oapi_studio.Description = title.StudioDesc
+		if title.StudioIllustID != nil {
+			oapi_studio.Poster.Id = title.StudioIllustID
+			oapi_studio.Poster.ImagePath = title.StudioImagePath
+			oapi_studio.Poster.StorageType = &title.StudioStorageType
+		}
 	}
+	oapi_title.Studio = &oapi_studio
 
 	var oapi_image oapi.Image
 
@@ -62,27 +84,13 @@ func (s Server) mapTitle(ctx context.Context, title sqlc.SearchTitlesRow) (oapi.
 	if title.ReleaseSeason != nil {
 		release_season = oapi.ReleaseSeason(*title.ReleaseSeason)
 	}
+	oapi_title.ReleaseSeason = &release_season
 
 	oapi_status, err := TitleStatus2oapi(&title.TitleStatus)
 	if err != nil {
 		return oapi.Title{}, fmt.Errorf("TitleStatus2oapi: %v", err)
 	}
-	oapi_title := oapi.Title{
-		EpisodesAired: title.EpisodesAired,
-		EpisodesAll:   title.EpisodesAired,
-		EpisodesLen:   &episodes_lens,
-		Id:            title.ID,
-		Poster:        &oapi_image,
-		Rating:        title.Rating,
-		RatingCount:   title.RatingCount,
-		ReleaseSeason: &release_season,
-		ReleaseYear:   title.ReleaseYear,
-		Studio:        &oapi_studio,
-		Tags:          oapi_tag_names,
-		TitleNames:    title_names,
-		TitleStatus:   oapi_status,
-		// AdditionalProperties:
-	}
+	oapi_title.TitleStatus = oapi_status
 
 	return oapi_title, nil
 }

modules/backend/handlers/titles.go

@@ -26,25 +26,25 @@ type SqlcStatus struct {
 	planned  string
 }
 
-func TitleStatus2Sqlc(s *[]oapi.TitleStatus) (*SqlcStatus, error) {
-	var sqlc_status SqlcStatus
-	if s == nil {
-		return &sqlc_status, nil
-	}
-	for _, t := range *s {
-		switch t {
-		case oapi.TitleStatusFinished:
-			sqlc_status.finished = "finished"
-		case oapi.TitleStatusOngoing:
-			sqlc_status.ongoing = "ongoing"
-		case oapi.TitleStatusPlanned:
-			sqlc_status.planned = "planned"
-		default:
-			return nil, fmt.Errorf("unexpected tittle status: %s", t)
-		}
-	}
-	return &sqlc_status, nil
-}
+// func TitleStatus2Sqlc(s *[]oapi.TitleStatus) (*SqlcStatus, error) {
+// 	var sqlc_status SqlcStatus
+// 	if s == nil {
+// 		return &sqlc_status, nil
+// 	}
+// 	for _, t := range *s {
+// 		switch t {
+// 		case oapi.TitleStatusFinished:
+// 			sqlc_status.finished = "finished"
+// 		case oapi.TitleStatusOngoing:
+// 			sqlc_status.ongoing = "ongoing"
+// 		case oapi.TitleStatusPlanned:
+// 			sqlc_status.planned = "planned"
+// 		default:
+// 			return nil, fmt.Errorf("unexpected tittle status: %s", t)
+// 		}
+// 	}
+// 	return &sqlc_status, nil
+// }
 
 func TitleStatus2oapi(s *sqlc.TitleStatusT) (*oapi.TitleStatus, error) {
 	if s == nil {
@@ -169,29 +169,8 @@ func (s Server) GetTitlesTitleId(ctx context.Context, request oapi.GetTitlesTitl
 		log.Errorf("%v", err)
 		return oapi.GetTitlesTitleId500Response{}, nil
 	}
-	_sqlc_title := sqlc.SearchTitlesRow{
-		ID:                sqlc_title.ID,
-		StudioID:          sqlc_title.StudioID,
-		PosterID:          sqlc_title.PosterID,
-		TitleStatus:       sqlc_title.TitleStatus,
-		Rating:            sqlc_title.Rating,
-		RatingCount:       sqlc_title.RatingCount,
-		ReleaseYear:       sqlc_title.ReleaseYear,
-		ReleaseSeason:     sqlc_title.ReleaseSeason,
-		Season:            sqlc_title.Season,
-		EpisodesAired:     sqlc_title.EpisodesAired,
-		EpisodesAll:       sqlc_title.EpisodesAll,
-		EpisodesLen:       sqlc_title.EpisodesLen,
-		TitleStorageType:  sqlc_title.TitleStorageType,
-		TitleImagePath:    sqlc_title.TitleImagePath,
-		TagNames:          sqlc_title.TitleNames,
-		StudioName:        sqlc_title.StudioName,
-		StudioIllustID:    sqlc_title.StudioIllustID,
-		StudioDesc:        sqlc_title.StudioDesc,
-		StudioStorageType: sqlc_title.StudioStorageType,
-		StudioImagePath:   sqlc_title.StudioImagePath,
-	}
-	oapi_title, err = s.mapTitle(ctx, _sqlc_title)
+
+	oapi_title, err = s.mapTitle(ctx, sqlc_title)
 	if err != nil {
 		log.Errorf("%v", err)
 		return oapi.GetTitlesTitleId500Response{}, nil
@@ -204,11 +183,6 @@ func (s Server) GetTitles(ctx context.Context, request oapi.GetTitlesRequestObje
 	opai_titles := make([]oapi.Title, 0)
 
 	word := Word2Sqlc(request.Params.Word)
-	status, err := TitleStatus2Sqlc(request.Params.Status)
-	if err != nil {
-		log.Errorf("%v", err)
-		return oapi.GetTitles400Response{}, err
-	}
 
 	season, err := ReleaseSeason2sqlc(request.Params.ReleaseSeason)
 	if err != nil {
@@ -216,16 +190,22 @@ func (s Server) GetTitles(ctx context.Context, request oapi.GetTitlesRequestObje
 		return oapi.GetTitles400Response{}, err
 	}
 
+	var statuses_sort []string
+	if request.Params.Status != nil {
+		for _, s := range *request.Params.Status {
+			ss := string(s) // s type is alias for string
+			statuses_sort = append(statuses_sort, ss)
+		}
+	}
+
 	params := sqlc.SearchTitlesParams{
 		Word:          word,
-		Ongoing:       status.ongoing,
-		Finished:      status.finished,
-		Planned:       status.planned,
+		TitleStatuses: statuses_sort,
 		Rating:        request.Params.Rating,
 		ReleaseYear:   request.Params.ReleaseYear,
 		ReleaseSeason: season,
-		Forward:       true,
-		SortBy:        "id",
+		Forward:       true, // default
+		SortBy:        "id", // default
 		Limit:         request.Params.Limit,
 	}
 
@@ -235,6 +215,7 @@ func (s Server) GetTitles(ctx context.Context, request oapi.GetTitlesRequestObje
 	if request.Params.Sort != nil {
 		params.SortBy = string(*request.Params.Sort)
 		if request.Params.Cursor != nil {
+			// here we set CursorYear CursorID CursorRating fields
 			err := ParseCursorInto(string(*request.Params.Sort), string(*request.Params.Cursor), &params)
 			if err != nil {
 				log.Errorf("%v", err)
@@ -256,7 +237,30 @@ func (s Server) GetTitles(ctx context.Context, request oapi.GetTitlesRequestObje
 
 	for _, title := range titles {
 
-		t, err := s.mapTitle(ctx, title)
+		_title := sqlc.GetTitleByIDRow{
+			ID: title.ID,
+			// StudioID:          title.StudioID,
+			PosterID:      title.PosterID,
+			TitleStatus:   title.TitleStatus,
+			Rating:        title.Rating,
+			RatingCount:   title.RatingCount,
+			ReleaseYear:   title.ReleaseYear,
+			ReleaseSeason: title.ReleaseSeason,
+			Season:        title.Season,
+			EpisodesAired: title.EpisodesAired,
+			EpisodesAll:   title.EpisodesAll,
+			// EpisodesLen:       title.EpisodesLen,
+			TitleStorageType: title.TitleStorageType,
+			TitleImagePath:   title.TitleImagePath,
+			TagNames:         title.TitleNames,
+			StudioName:       title.StudioName,
+			// StudioIllustID:    title.StudioIllustID,
+			// StudioDesc:        title.StudioDesc,
+			// StudioStorageType: title.StudioStorageType,
+			// StudioImagePath:   title.StudioImagePath,
+		}
+
+		t, err := s.mapTitle(ctx, _title)
 		if err != nil {
 			log.Errorf("%v", err)
 			return oapi.GetTitles500Response{}, nil

modules/backend/handlers/users.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	oapi "nyanimedb/api"
 	sqlc "nyanimedb/sql"
+	"strconv"
 	"time"
 
 	"github.com/jackc/pgx/v5"
@@ -53,8 +54,12 @@ func (s Server) GetUsersUserId(ctx context.Context, req oapi.GetUsersUserIdReque
 	return oapi.GetUsersUserId200JSONResponse(mapUser(user)), nil
 }
 
-func sqlDate2oapi(p_date pgtype.Timestamptz) (time.Time, error) {
-	return time.Time{}, nil
+func sqlDate2oapi(p_date pgtype.Timestamptz) *time.Time {
+	if p_date.Valid {
+		t := p_date.Time
+		return &t
+	}
+	return nil
 }
 
 type SqlcUserStatus struct {
@@ -64,26 +69,94 @@ type SqlcUserStatus struct {
 	in_progress string
 }
 
-func UserTitleStatus2Sqlc(s *[]oapi.UserTitleStatus) (*SqlcUserStatus, error) {
-	var sqlc_status SqlcUserStatus
-	if s == nil {
-		return &sqlc_status, nil
+// func UserTitleStatus2Sqlc(s *[]oapi.UserTitleStatus) (*SqlcUserStatus, error) {
+// 	var sqlc_status SqlcUserStatus
+// 	if s == nil {
+// 		return &sqlc_status, nil
+// 	}
+// 	for _, t := range *s {
+// 		switch t {
+// 		case oapi.UserTitleStatusFinished:
+// 			sqlc_status.finished = "finished"
+// 		case oapi.UserTitleStatusDropped:
+// 			sqlc_status.dropped = "dropped"
+// 		case oapi.UserTitleStatusPlanned:
+// 			sqlc_status.planned = "planned"
+// 		case oapi.UserTitleStatusInProgress:
+// 			sqlc_status.in_progress = "in-progress"
+// 		default:
+// 			return nil, fmt.Errorf("unexpected tittle status: %s", t)
+// 		}
+// 	}
+// 	return &sqlc_status, nil
+// }
+
+func sql2usertitlestatus(s sqlc.UsertitleStatusT) (oapi.UserTitleStatus, error) {
+	var status oapi.UserTitleStatus
+
+	switch status {
+	case "finished":
+		status = oapi.UserTitleStatusFinished
+	case "dropped":
+		status = oapi.UserTitleStatusDropped
+	case "planned":
+		status = oapi.UserTitleStatusPlanned
+	case "in-progress":
+		status = oapi.UserTitleStatusInProgress
+	default:
+		return status, fmt.Errorf("unexpected tittle status: %s", s)
 	}
-	for _, t := range *s {
-		switch t {
-		case oapi.UserTitleStatusFinished:
-			sqlc_status.finished = "finished"
-		case oapi.UserTitleStatusDropped:
-			sqlc_status.dropped = "dropped"
-		case oapi.UserTitleStatusPlanned:
-			sqlc_status.planned = "planned"
-		case oapi.UserTitleStatusInProgress:
-			sqlc_status.in_progress = "in-progress"
-		default:
-			return nil, fmt.Errorf("unexpected tittle status: %s", t)
-		}
+
+	return status, nil
+}
+
+func (s Server) mapUsertitle(ctx context.Context, t sqlc.SearchUserTitlesRow) (oapi.UserTitle, error) {
+
+	oapi_usertitle := oapi.UserTitle{
+		Ctime:    sqlDate2oapi(t.UserCtime),
+		Rate:     t.UserRate,
+		ReviewId: t.ReviewID,
+		// Status: ,
+		// Title: ,
+		UserId: t.UserID,
 	}
-	return &sqlc_status, nil
+
+	status, err := sql2usertitlestatus(t.UsertitleStatus)
+	if err != nil {
+		return oapi_usertitle, fmt.Errorf("mapUsertitle: %v", err)
+	}
+	oapi_usertitle.Status = status
+
+	_title := sqlc.GetTitleByIDRow{
+		ID: t.ID,
+		// StudioID:          title.StudioID,
+		PosterID:      t.PosterID,
+		TitleStatus:   t.TitleStatus,
+		Rating:        t.Rating,
+		RatingCount:   t.RatingCount,
+		ReleaseYear:   t.ReleaseYear,
+		ReleaseSeason: t.ReleaseSeason,
+		Season:        t.Season,
+		EpisodesAired: t.EpisodesAired,
+		EpisodesAll:   t.EpisodesAll,
+		// EpisodesLen:       title.EpisodesLen,
+		TitleStorageType: t.TitleStorageType,
+		TitleImagePath:   t.TitleImagePath,
+		TagNames:         t.TitleNames,
+		StudioName:       t.StudioName,
+		// StudioIllustID:    title.StudioIllustID,
+		// StudioDesc:        title.StudioDesc,
+		// StudioStorageType: title.StudioStorageType,
+		// StudioImagePath:   title.StudioImagePath,
+	}
+
+	oapi_title, err := s.mapTitle(ctx, _title)
+	if err != nil {
+		return oapi_usertitle, fmt.Errorf("mapUsertitle: %v", err)
+	}
+	oapi_usertitle.Title = &oapi_title
+
+	return oapi_usertitle, nil
 }
 
 func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersUserIdTitlesRequestObject) (oapi.GetUsersUserIdTitlesResponseObject, error) {
@@ -91,11 +164,6 @@ func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersU
 	oapi_usertitles := make([]oapi.UserTitle, 0)
 
 	word := Word2Sqlc(request.Params.Word)
-	status, err := TitleStatus2Sqlc(request.Params.Status)
-	if err != nil {
-		log.Errorf("%v", err)
-		return oapi.GetUsersUserIdTitles400Response{}, err
-	}
 
 	season, err := ReleaseSeason2sqlc(request.Params.ReleaseSeason)
 	if err != nil {
@@ -103,23 +171,33 @@ func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersU
 		return oapi.GetUsersUserIdTitles400Response{}, err
 	}
 
+	var statuses_sort []string
+	if request.Params.Status != nil {
+		for _, s := range *request.Params.Status {
+			ss := string(s) // s type is alias for string
+			statuses_sort = append(statuses_sort, ss)
+		}
+	}
+
+	var watch_status []string
+	if request.Params.WatchStatus != nil {
+		for _, s := range *request.Params.WatchStatus {
+			ss := string(s) // s type is alias for string
+			watch_status = append(statuses_sort, ss)
+		}
+	}
+
 	params := sqlc.SearchUserTitlesParams{
-		Forward: true,
-		SortBy:  "id",
-		// CursorYear    :
-		// CursorID      *int64          `json:"cursor_id"`
-		// CursorRating  *float64        `json:"cursor_rating"`
-		// Word          *string         `json:"word"`
-		// Ongoing       string          `json:"ongoing"`
-		// Planned       string          `json:"planned"`
-		// Dropped       string          `json:"dropped"`
-		// InProgress    string          `json:"in-progress"`
-		// Finished      string          `json:"finished"`
-		// Rate          *int32          `json:"rate"`
-		// Rating        *float64        `json:"rating"`
-		// ReleaseYear   *int32          `json:"release_year"`
-		// ReleaseSeason *ReleaseSeasonT `json:"release_season"`
-		// Limit         *int32          `json:"limit"`
+		Word:              word,
+		TitleStatuses:     statuses_sort,
+		UsertitleStatuses: watch_status,
+		Rating:            request.Params.Rating,
+		Rate:              request.Params.MyRate,
+		ReleaseYear:       request.Params.ReleaseYear,
+		ReleaseSeason:     season,
+		Forward:           true, // default
+		SortBy:            "id", // default
+		Limit:             request.Params.Limit,
 	}
 
 	if request.Params.SortForward != nil {
@@ -128,6 +206,7 @@ func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersU
 	if request.Params.Sort != nil {
 		params.SortBy = string(*request.Params.Sort)
 		if request.Params.Cursor != nil {
+			// here we set CursorYear CursorID CursorRating fields
 			err := ParseCursorInto(string(*request.Params.Sort), string(*request.Params.Cursor), &params)
 			if err != nil {
 				log.Errorf("%v", err)
@@ -144,30 +223,30 @@ func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersU
 	if len(titles) == 0 {
 		return oapi.GetUsersUserIdTitles204Response{}, nil
 	}
+
+	var new_cursor oapi.CursorObj
+
 	for _, title := range titles {
-		_sqlc_title := sqlc.SearchTitlesRow{
-			ID:                sqlc_title.ID,
-			StudioID:          sqlc_title.StudioID,
-			PosterID:          sqlc_title.PosterID,
-			TitleStatus:       sqlc_title.TitleStatus,
-			Rating:            sqlc_title.Rating,
-			RatingCount:       sqlc_title.RatingCount,
-			ReleaseYear:       sqlc_title.ReleaseYear,
-			ReleaseSeason:     sqlc_title.ReleaseSeason,
-			Season:            sqlc_title.Season,
-			EpisodesAired:     sqlc_title.EpisodesAired,
-			EpisodesAll:       sqlc_title.EpisodesAll,
-			EpisodesLen:       sqlc_title.EpisodesLen,
-			TitleStorageType:  sqlc_title.TitleStorageType,
-			TitleImagePath:    sqlc_title.TitleImagePath,
-			TagNames:          sqlc_title.TitleNames,
-			StudioName:        sqlc_title.StudioName,
-			StudioIllustID:    sqlc_title.StudioIllustID,
-			StudioDesc:        sqlc_title.StudioDesc,
-			StudioStorageType: sqlc_title.StudioStorageType,
-			StudioImagePath:   sqlc_title.StudioImagePath,
+
+		t, err := s.mapUsertitle(ctx, title)
+		if err != nil {
+			log.Errorf("%v", err)
+			return oapi.GetUsersUserIdTitles500Response{}, nil
+		}
+		oapi_usertitles = append(oapi_usertitles, t)
+
+		new_cursor.Id = t.Title.Id
+		if request.Params.Sort != nil {
+			switch string(*request.Params.Sort) {
+			case "year":
+				tmp := fmt.Sprint(*t.Title.ReleaseYear)
+				new_cursor.Param = &tmp
+			case "rating":
+				tmp := strconv.FormatFloat(*t.Title.Rating, 'f', -1, 64)
+				new_cursor.Param = &tmp
+			}
 		}
 	}
 
-	return oapi.GetUsersUserIdTitles200JSONResponse(userTitles), nil
+	return oapi.GetUsersUserIdTitles200JSONResponse{Cursor: new_cursor, Data: oapi_usertitles}, nil
 }