Merge pull request #29 from ProjectBARO/feat/analysis-report

자세 분석 보고서 기능 구현 (앱 관련 대응)

app/report/controllers/report_controller.go

@@ -4,15 +4,16 @@ import (
 	"gdsc/baro/app/report/services"
 	"gdsc/baro/app/report/types"
 	"gdsc/baro/global"
+	"strconv"
 
 	"github.com/gin-gonic/gin"
 )
 
 type ReportController struct {
-	ReportService *services.ReportService
+	ReportService services.ReportServiceInterface
 }
 
-func NewReportController(reportService *services.ReportService) *ReportController {
+func NewReportController(reportService services.ReportServiceInterface) *ReportController {
 	return &ReportController{
 		ReportService: reportService,
 	}
@@ -23,13 +24,13 @@ func NewReportController(reportService *services.ReportService) *ReportControlle
 // @Description 자세를 추정합니다. (동영상 URL을 입력받아 자세를 추정합니다.)
 // @Accept  json
 // @Produce  json
-// @Param   video_url    body    types.RequestPredict   true    "동영상 URL"
+// @Param   video_url    body    types.RequestAnalysis   true    "URL, 알림 횟수 등"
 // @Success 200 {object} global.Response
 // @Failure 400 {object} global.Response
 // @Security Bearer
-// @Router /predict [post]
-func (controller *ReportController) Predict(c *gin.Context) {
-	var input types.RequestPredict
+// @Router /analysis [post]
+func (controller *ReportController) Analysis(c *gin.Context) {
+	var input types.RequestAnalysis
 	if err := c.ShouldBindJSON(&input); err != nil {
 		c.JSON(400, global.Response{
 			Status:  400,
@@ -46,7 +47,7 @@ func (controller *ReportController) Predict(c *gin.Context) {
 		return
 	}
 
-	response, err := controller.ReportService.Predict(c, input)
+	response, err := controller.ReportService.Analysis(c, input)
 	if err != nil {
 		c.JSON(400, global.Response{
 			Status:  400,
@@ -70,8 +71,8 @@ func (controller *ReportController) Predict(c *gin.Context) {
 // @Success 200 {object} global.Response
 // @Failure 400 {object} global.Response
 // @Security Bearer
-// @Router /predict [get]
-func (controller *ReportController) GetPredict(c *gin.Context) {
+// @Router /analysis [get]
+func (controller *ReportController) GetAnalysis(c *gin.Context) {
 	response, err := controller.ReportService.FindReportByCurrentUser(c)
 	if err != nil {
 		c.JSON(400, global.Response{
@@ -88,6 +89,73 @@ func (controller *ReportController) GetPredict(c *gin.Context) {
 	})
 }
 
+// @Tags Reports
+// @Summary 자세 추정 결과 id로 조회
+// @Description 보고서 id로 자세 추정 결과를 조회합니다. (요약으로 먼저 보고서 id 조회하고 사용자가 그걸 누르면 이걸 사용하기)
+// @Accept  json
+// @Produce  json
+// @Param   id    path    int   true    "자세 추정 결과 id"
+// @Success 200 {object} global.Response
+// @Failure 400 {object} global.Response
+// @Security Bearer
+// @Router /analysis/{id} [get]
+func (controller *ReportController) GetAnalysisById(c *gin.Context) {
+	idStr := c.Param("id")
+
+	id, err := strconv.ParseUint(idStr, 10, 32)
+	if err != nil {
+		c.JSON(400, global.Response{
+			Status:  400,
+			Message: "Invalid ID",
+		})
+		return
+	}
+
+	response, err := controller.ReportService.FindById(c, uint(id))
+	if err != nil {
+		c.JSON(400, global.Response{
+			Status:  400,
+			Message: err.Error(),
+		})
+		return
+	}
+
+	c.JSON(200, global.Response{
+		Status:  200,
+		Message: "success",
+		Data:    response,
+	})
+}
+
+// @Tags Reports
+// @Summary 자세 추정 결과 월별 요약 조회
+// @Description 로그인한 사용자의 자세 추정 결과를 월별로 요약하여 조회합니다. (캘린더 점 찍는 용도로 사용)
+// @Accept  json
+// @Produce  json
+// @Param   ym  query    string   true    "조회할 년월 (YYYYMM) 예시: 202401 (2024년 1월)"
+// @Success 200 {object} global.Response
+// @Failure 400 {object} global.Response
+// @Security Bearer
+// @Router /analysis/summary [get]
+func (controller *ReportController) GetAnalysisSummary(c *gin.Context) {
+	yearAndMonth := c.Query("ym")
+
+	response, err := controller.ReportService.FindReportSummaryByMonth(c, yearAndMonth)
+	if err != nil {
+		c.JSON(400, global.Response{
+			Status:  400,
+			Message: err.Error(),
+		})
+		return
+	}
+
+	c.JSON(200, global.Response{
+		Status:  200,
+		Message: "success",
+		Data:    response,
+	})
+}
+
 // @Tags Reports
 // @Summary 자세 추정 결과 전체 조회 (테스트용)
 // @Description 자세 추정 결과를 조회합니다.
@@ -96,8 +164,8 @@ func (controller *ReportController) GetPredict(c *gin.Context) {
 // @Success 200 {object} global.Response
 // @Failure 400 {object} global.Response
 // @Security Bearer
-// @Router /predict/all [get]
-func (controller *ReportController) GetPredicts(c *gin.Context) {
+// @Router /analysis/all [get]
+func (controller *ReportController) GetAnalyzes(c *gin.Context) {
 	response, err := controller.ReportService.FindAll()
 	if err != nil {
 		c.JSON(400, global.Response{

app/report/models/Report.go

@@ -3,8 +3,11 @@ package models
 import "time"
 
 type Report struct {
-	ID        uint `gorm:"primaryKey"`
-	UserID    uint
-	Predict   string
-	CreatedAt time.Time `gorm:"autoCreateTime"`
+	ID           uint `gorm:"primaryKey"`
+	UserID       uint
+	AlertCount   uint
+	AnalysisTime uint
+	Type         string
+	Predict      string
+	CreatedAt    time.Time `gorm:"autoCreateTime"`
 }

app/report/repositories/report_repository.go

@@ -6,6 +6,14 @@ import (
 	"gorm.io/gorm"
 )
 
+type ReportRepositoryInterface interface {
+	Save(report *models.Report) error
+	FindByUserID(userID uint) ([]models.Report, error)
+	FindById(id uint) (models.Report, error)
+	FindByYearAndMonth(userID uint, month string) ([]models.Report, error)
+	FindAll() ([]models.Report, error)
+}
+
 type ReportRepository struct {
 	DB *gorm.DB
 }
@@ -29,6 +37,18 @@ func (repo *ReportRepository) FindByUserID(userID uint) ([]models.Report, error)
 	return reports, result.Error
 }
 
+func (repo *ReportRepository) FindById(id uint) (models.Report, error) {
+	var report models.Report
+	result := repo.DB.Where("id = ?", id).First(&report)
+	return report, result.Error
+}
+
+func (repo *ReportRepository) FindByYearAndMonth(userID uint, yearAndMonth string) ([]models.Report, error) {
+	var reports []models.Report
+	result := repo.DB.Where("user_id = ? AND DATE_FORMAT(created_at, '%Y%m') = ?", userID, yearAndMonth).Find(&reports)
+	return reports, result.Error
+}
+
 func (repo *ReportRepository) FindAll() ([]models.Report, error) {
 	var reports []models.Report
 	result := repo.DB.Find(&reports)

app/report/services/report_service.go

@@ -16,29 +16,37 @@ import (
 	"golang.org/x/net/html"
 )
 
+type ReportServiceInterface interface {
+	Analysis(c *gin.Context, input types.RequestAnalysis) (string, error)
+	FindReportByCurrentUser(c *gin.Context) ([]types.ResponseReport, error)
+	FindById(c *gin.Context, id uint) (types.ResponseReport, error)
+	FindReportSummaryByMonth(c *gin.Context, yearAndMonth string) ([]types.ResponseReportSummary, error)
+	FindAll() ([]types.ResponseReport, error)
+}
+
 type ReportService struct {
-	ReportRepository *repositories.ReportRepository
-	UserUtil         *utils.UserUtil
+	ReportRepository repositories.ReportRepositoryInterface
+	UserUtil         utils.UserUtilInterface
 }
 
-func NewReportService(reportRepository *repositories.ReportRepository, userUtil *utils.UserUtil) *ReportService {
+func NewReportService(reportRepository repositories.ReportRepositoryInterface, userUtil utils.UserUtilInterface) *ReportService {
 	return &ReportService{
 		ReportRepository: reportRepository,
 		UserUtil:         userUtil,
 	}
 }
 
-func (service *ReportService) Predict(c *gin.Context, input types.RequestPredict) (string, error) {
+func (service *ReportService) Analysis(c *gin.Context, input types.RequestAnalysis) (string, error) {
 	user, err := service.UserUtil.FindCurrentUser(c)
 	if err != nil {
-		return "", err
+		return "Not Found User", err
 	}
 
 	REQUEST_URL := os.Getenv("AI_SERVER_API_URL")
 
 	u, err := url.Parse(REQUEST_URL)
 	if err != nil {
-		return "", err
+		return "Not Found AI Server", err
 	}
 
 	q := u.Query()
@@ -70,7 +78,10 @@ func (service *ReportService) Predict(c *gin.Context, input types.RequestPredict
 		}
 
 		report := models.Report{
-			UserID: user.ID,
+			UserID:       user.ID,
+			AlertCount:   input.AlertCount,
+			AnalysisTime: input.AnalysisTime,
+			Type:         input.Type,
 		}
 
 		// TODO: refactor, AI Server Change to return JSON
@@ -99,7 +110,7 @@ func (service *ReportService) Predict(c *gin.Context, input types.RequestPredict
 	return message, nil
 }
 
-func (service *ReportService) FindReportByCurrentUser(c *gin.Context) ([]types.ResponsePredict, error) {
+func (service *ReportService) FindReportByCurrentUser(c *gin.Context) ([]types.ResponseReport, error) {
 	user, err := service.UserUtil.FindCurrentUser(c)
 	if err != nil {
 		return nil, err
@@ -110,12 +121,57 @@ func (service *ReportService) FindReportByCurrentUser(c *gin.Context) ([]types.R
 		return nil, err
 	}
 
-	var responseReports []types.ResponsePredict
+	var responseReports []types.ResponseReport
+	for _, report := range reports {
+		responseReport := types.ResponseReport{
+			ID:           report.ID,
+			UserID:       report.UserID,
+			AlertCount:   report.AlertCount,
+			AnalysisTime: report.AnalysisTime,
+			Predict:      report.Predict,
+			Type:         report.Type,
+			CreatedAt:    report.CreatedAt,
+		}
+		responseReports = append(responseReports, responseReport)
+	}
+
+	return responseReports, nil
+}
+
+func (service *ReportService) FindById(c *gin.Context, id uint) (types.ResponseReport, error) {
+	report, err := service.ReportRepository.FindById(id)
+	if err != nil {
+		return types.ResponseReport{}, err
+	}
+
+	responseReport := types.ResponseReport{
+		ID:           report.ID,
+		UserID:       report.UserID,
+		AlertCount:   report.AlertCount,
+		AnalysisTime: report.AnalysisTime,
+		Predict:      report.Predict,
+		Type:         report.Type,
+		CreatedAt:    report.CreatedAt,
+	}
+
+	return responseReport, nil
+}
+
+func (service *ReportService) FindReportSummaryByMonth(c *gin.Context, yearAndMonth string) ([]types.ResponseReportSummary, error) {
+	user, err := service.UserUtil.FindCurrentUser(c)
+	if err != nil {
+		return nil, err
+	}
+
+	reports, err := service.ReportRepository.FindByYearAndMonth(user.ID, yearAndMonth)
+	if err != nil {
+		return nil, err
+	}
+
+	var responseReports []types.ResponseReportSummary
 	for _, report := range reports {
-		responseReport := types.ResponsePredict{
+		responseReport := types.ResponseReportSummary{
 			ID:        report.ID,
-			UserID:    report.UserID,
-			Predict:   report.Predict,
 			CreatedAt: report.CreatedAt,
 		}
 		responseReports = append(responseReports, responseReport)
@@ -124,19 +180,22 @@ func (service *ReportService) FindReportByCurrentUser(c *gin.Context) ([]types.R
 	return responseReports, nil
 }
 
-func (service *ReportService) FindAll() ([]types.ResponsePredict, error) {
+func (service *ReportService) FindAll() ([]types.ResponseReport, error) {
 	reports, err := service.ReportRepository.FindAll()
 	if err != nil {
 		return nil, err
 	}
 
-	var responseReports []types.ResponsePredict
+	var responseReports []types.ResponseReport
 	for _, report := range reports {
-		responseReport := types.ResponsePredict{
-			ID:        report.ID,
-			UserID:    report.UserID,
-			Predict:   report.Predict,
-			CreatedAt: report.CreatedAt,
+		responseReport := types.ResponseReport{
+			ID:           report.ID,
+			UserID:       report.UserID,
+			AlertCount:   report.AlertCount,
+			AnalysisTime: report.AnalysisTime,
+			Predict:      report.Predict,
+			Type:         report.Type,
+			CreatedAt:    report.CreatedAt,
 		}
 		responseReports = append(responseReports, responseReport)
 	}

app/report/types/request_types.go

@@ -8,10 +8,17 @@ func init() {
 	validate = validator.New()
 }
 
-type RequestPredict struct {
-	VideoURL string `json:"video_url" validate:"required"`
+type RequestAnalysis struct {
+	VideoURL     string `json:"video_url" validate:"required"`
+	AlertCount   uint   `json:"alert_count" validate:"required"`
+	AnalysisTime uint   `json:"analysis_time" validate:"required"`
+	Type         string `json:"type" validate:"required"`
 }
 
-func (r *RequestPredict) Validate() error {
+type RequestReportSummary struct {
+	YearAndMonth string `json:"year_and_month" validate:"required"`
+}
+
+func (r *RequestAnalysis) Validate() error {
 	return validate.Struct(r)
 }

app/report/types/response_types.go

@@ -2,9 +2,17 @@ package types
 
 import "time"
 
-type ResponsePredict struct {
+type ResponseReportSummary struct {
 	ID        uint      `json:"id"`
-	UserID    uint      `json:"user_id"`
-	Predict   string    `json:"predict"`
 	CreatedAt time.Time `json:"created_at"`
 }
+
+type ResponseReport struct {
+	ID           uint      `json:"id"`
+	UserID       uint      `json:"user_id"`
+	AlertCount   uint      `json:"alert_count"`
+	AnalysisTime uint      `json:"analysis_time"`
+	Predict      string    `json:"predict"`
+	Type         string    `json:"type"`
+	CreatedAt    time.Time `json:"created_at"`
+}