Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[close #28, close #30] 다양한 자세 분석 결과 추가 및 푸시 알림 기능 구현 (FCM) #31

Merged
merged 10 commits into from
Jan 30, 2024
Merged

[close #28, close #30] 다양한 자세 분석 결과 추가 및 푸시 알림 기능 구현 (FCM) #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
79178ef
[#30] feat: firebase messaging 관련 의존성 추가
YehyeokBang Jan 24, 2024
c9beefa
[#30] feat: fcm 토큰 관리 기능 구현
YehyeokBang Jan 25, 2024
86c1a20
[#30] feat: firebase messaging 초기화 및 푸시 알림 기능 구현
YehyeokBang Jan 25, 2024
2a3abce
[#30] feat: 자세 분석 완료시 사용자에게 푸시 알림 기능 구현
YehyeokBang Jan 25, 2024
4e70105
[#30] docs: 푸시 알림 관련 API 문서 최신화
YehyeokBang Jan 25, 2024
3ae7994
사용자 fcm 토큰 수정 API 추가
YehyeokBang Jan 25, 2024
62b162f
[#28] feat: 자세 분석 결과 필드 추가
YehyeokBang Jan 28, 2024
836b960
[#28] feat: AI 서버의 자세 분석 결과값 변경 대응
YehyeokBang Jan 29, 2024
545101b
[#30] test: fcm 토큰 수정 기능 관련 테스트 코드 추가
YehyeokBang Jan 29, 2024
5510300
test: 미흡한 테스트 코드 추가 작성
YehyeokBang Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions app/report/models/Report.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@ package models
import "time"

type Report struct {
ID uint `gorm:"primaryKey"`
UserID uint
AlertCount int
AnalysisTime int
Type string
Predict string
CreatedAt time.Time `gorm:"autoCreateTime"`
ID uint `gorm:"primaryKey"`
UserID uint
AlertCount int
AnalysisTime int
Type string
Predict string
NormalRatio string
Score string
NeckAngles string
Distances string
StatusFrequencies string
CreatedAt time.Time `gorm:"autoCreateTime"`
}
170 changes: 115 additions & 55 deletions app/report/repositories/report_repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,23 @@ func TestReportrRepository_Save(t *testing.T) {

// Create sample report for the test
report := models.Report{
UserID: 1,
AlertCount: 30,
AnalysisTime: 3600,
Predict: "Good",
Type: "Study",
CreatedAt: time.Now(),
UserID: 1,
AlertCount: 30,
AnalysisTime: 3600,
Type: "Study",
Predict: "Good",
Score: "90.000",
NormalRatio: "90.000",
NeckAngles: "angle",
Distances: "distance",
StatusFrequencies: "status",
CreatedAt: time.Now(),
}

// Set up expectations for the mock DB to return the sample report
mock.ExpectBegin()
mock.ExpectExec("INSERT INTO `reports`").
WithArgs(report.UserID, report.AlertCount, report.AnalysisTime, report.Type, report.Predict, report.CreatedAt).
WithArgs(report.UserID, report.AlertCount, report.AnalysisTime, report.Type, report.Predict, report.Score, report.NormalRatio, report.NeckAngles, report.Distances, report.StatusFrequencies, report.CreatedAt).
WillReturnResult(sqlmock.NewResult(1, 1))
mock.ExpectCommit()

Expand All @@ -64,8 +69,14 @@ func TestReportrRepository_Save(t *testing.T) {
assert.Equal(t, report.UserID, createdReport.UserID)
assert.Equal(t, report.AlertCount, createdReport.AlertCount)
assert.Equal(t, report.AnalysisTime, createdReport.AnalysisTime)
assert.Equal(t, report.Predict, createdReport.Predict)
assert.Equal(t, report.Type, createdReport.Type)
assert.Equal(t, report.Predict, createdReport.Predict)
assert.Equal(t, report.Score, createdReport.Score)
assert.Equal(t, report.NormalRatio, createdReport.NormalRatio)
assert.Equal(t, report.NeckAngles, createdReport.NeckAngles)
assert.Equal(t, report.Distances, createdReport.Distances)
assert.Equal(t, report.StatusFrequencies, createdReport.StatusFrequencies)
assert.Equal(t, report.CreatedAt, createdReport.CreatedAt)
}

func TestReportRepository_Save_Error(t *testing.T) {
Expand All @@ -92,18 +103,23 @@ func TestReportRepository_Save_Error(t *testing.T) {

// Create sample report for the test
report := models.Report{
UserID: 1,
AlertCount: 30,
AnalysisTime: 3600,
Predict: "Good",
Type: "Study",
CreatedAt: time.Now(),
UserID: 1,
AlertCount: 30,
AnalysisTime: 3600,
Type: "Study",
Predict: "Good",
Score: "90.000",
NormalRatio: "90.000",
NeckAngles: "angle",
Distances: "distance",
StatusFrequencies: "status",
CreatedAt: time.Now(),
}

// Set up expectations for the mock DB to return the sample report
mock.ExpectBegin()
mock.ExpectExec("INSERT INTO `reports`").
WithArgs(report.UserID, report.AlertCount, report.AnalysisTime, report.Type, report.Predict, report.CreatedAt).
WithArgs(report.UserID, report.AlertCount, report.AnalysisTime, report.Type, report.Predict, report.Score, report.NormalRatio, report.NeckAngles, report.Distances, report.StatusFrequencies, report.CreatedAt).
WillReturnError(err)
mock.ExpectRollback()

Expand Down Expand Up @@ -141,18 +157,23 @@ func TestReportRepository_FindByUserID(t *testing.T) {

// Create sample report for the test
report := models.Report{
UserID: 1,
AlertCount: 30,
AnalysisTime: 3600,
Predict: "Good",
Type: "Study",
CreatedAt: time.Now(),
UserID: 1,
AlertCount: 30,
AnalysisTime: 3600,
Type: "Study",
Predict: "Good",
Score: "90.000",
NormalRatio: "90.000",
NeckAngles: "angle",
Distances: "distance",
StatusFrequencies: "status",
CreatedAt: time.Now(),
}

// Set up expectations for the mock DB to return the sample report
mock.ExpectBegin()
mock.ExpectExec("INSERT INTO `reports`").
WithArgs(report.UserID, report.AlertCount, report.AnalysisTime, report.Type, report.Predict, report.CreatedAt).
WithArgs(report.UserID, report.AlertCount, report.AnalysisTime, report.Type, report.Predict, report.Score, report.NormalRatio, report.NeckAngles, report.Distances, report.StatusFrequencies, report.CreatedAt).
WillReturnResult(sqlmock.NewResult(1, 1))
mock.ExpectCommit()

Expand All @@ -165,8 +186,8 @@ func TestReportRepository_FindByUserID(t *testing.T) {
// Set up expectations for the mock DB to return the sample report
mock.ExpectQuery("SELECT \\* FROM `reports` WHERE user_id = \\?").
WithArgs(report.UserID).
WillReturnRows(sqlmock.NewRows([]string{"id", "user_id", "alert_count", "analysis_time", "type", "predict", "created_at"}).
AddRow(savedReport.ID, savedReport.UserID, savedReport.AlertCount, savedReport.AnalysisTime, savedReport.Type, savedReport.Predict, savedReport.CreatedAt))
WillReturnRows(sqlmock.NewRows([]string{"id", "user_id", "alert_count", "analysis_time", "type", "predict", "score", "normal_ratio", "neck_angles", "distances", "status_frequencies", "created_at"}).
AddRow(savedReport.ID, savedReport.UserID, savedReport.AlertCount, savedReport.AnalysisTime, savedReport.Type, savedReport.Predict, savedReport.Score, savedReport.NormalRatio, savedReport.NeckAngles, savedReport.Distances, savedReport.StatusFrequencies, savedReport.CreatedAt))

// Call the method under test
reports, err := reportRepository.FindByUserID(report.UserID)
Expand All @@ -181,8 +202,14 @@ func TestReportRepository_FindByUserID(t *testing.T) {
assert.Equal(t, savedReport.UserID, reports[0].UserID)
assert.Equal(t, savedReport.AlertCount, reports[0].AlertCount)
assert.Equal(t, savedReport.AnalysisTime, reports[0].AnalysisTime)
assert.Equal(t, savedReport.Predict, reports[0].Predict)
assert.Equal(t, savedReport.Type, reports[0].Type)
assert.Equal(t, savedReport.Predict, reports[0].Predict)
assert.Equal(t, savedReport.Score, reports[0].Score)
assert.Equal(t, savedReport.NormalRatio, reports[0].NormalRatio)
assert.Equal(t, savedReport.NeckAngles, reports[0].NeckAngles)
assert.Equal(t, savedReport.Distances, reports[0].Distances)
assert.Equal(t, savedReport.StatusFrequencies, reports[0].StatusFrequencies)
assert.Equal(t, savedReport.CreatedAt, reports[0].CreatedAt)
}

func TestReportRepository_FindByUserID_Error(t *testing.T) {
Expand Down Expand Up @@ -245,18 +272,23 @@ func TestReportRepository_FindById(t *testing.T) {

// Create sample report for the test
report := models.Report{
UserID: 1,
AlertCount: 30,
AnalysisTime: 3600,
Predict: "Good",
Type: "Study",
CreatedAt: time.Now(),
UserID: 1,
AlertCount: 30,
AnalysisTime: 3600,
Type: "Study",
Predict: "Good",
Score: "90.000",
NormalRatio: "90.000",
NeckAngles: "angle",
Distances: "distance",
StatusFrequencies: "status",
CreatedAt: time.Now(),
}

// Set up expectations for the mock DB to return the sample report
mock.ExpectBegin()
mock.ExpectExec("INSERT INTO `reports`").
WithArgs(report.UserID, report.AlertCount, report.AnalysisTime, report.Type, report.Predict, report.CreatedAt).
WithArgs(report.UserID, report.AlertCount, report.AnalysisTime, report.Type, report.Predict, report.Score, report.NormalRatio, report.NeckAngles, report.Distances, report.StatusFrequencies, report.CreatedAt).
WillReturnResult(sqlmock.NewResult(1, 1))
mock.ExpectCommit()

Expand All @@ -269,8 +301,8 @@ func TestReportRepository_FindById(t *testing.T) {
// Set up expectations for the mock DB to return the sample report
mock.ExpectQuery("SELECT \\* FROM `reports` WHERE id = \\?").
WithArgs(savedReport.ID).
WillReturnRows(sqlmock.NewRows([]string{"id", "user_id", "alert_count", "analysis_time", "type", "predict", "created_at"}).
AddRow(savedReport.ID, savedReport.UserID, savedReport.AlertCount, savedReport.AnalysisTime, savedReport.Type, savedReport.Predict, savedReport.CreatedAt))
WillReturnRows(sqlmock.NewRows([]string{"id", "user_id", "alert_count", "analysis_time", "type", "predict", "score", "normal_ratio", "neck_angles", "distances", "status_frequencies", "created_at"}).
AddRow(savedReport.ID, savedReport.UserID, savedReport.AlertCount, savedReport.AnalysisTime, savedReport.Type, savedReport.Predict, savedReport.Score, savedReport.NormalRatio, savedReport.NeckAngles, savedReport.Distances, savedReport.StatusFrequencies, savedReport.CreatedAt))

// Call the method under test
report, err = reportRepository.FindById(savedReport.ID)
Expand All @@ -285,8 +317,14 @@ func TestReportRepository_FindById(t *testing.T) {
assert.Equal(t, savedReport.UserID, report.UserID)
assert.Equal(t, savedReport.AlertCount, report.AlertCount)
assert.Equal(t, savedReport.AnalysisTime, report.AnalysisTime)
assert.Equal(t, savedReport.Predict, report.Predict)
assert.Equal(t, savedReport.Type, report.Type)
assert.Equal(t, savedReport.Predict, report.Predict)
assert.Equal(t, savedReport.Score, report.Score)
assert.Equal(t, savedReport.NormalRatio, report.NormalRatio)
assert.Equal(t, savedReport.NeckAngles, report.NeckAngles)
assert.Equal(t, savedReport.Distances, report.Distances)
assert.Equal(t, savedReport.StatusFrequencies, report.StatusFrequencies)
assert.Equal(t, savedReport.CreatedAt, report.CreatedAt)
}

func TestReportRepository_FindById_Error(t *testing.T) {
Expand Down Expand Up @@ -348,18 +386,23 @@ func TestReportRepository_FindByYearAndMonth(t *testing.T) {

// Create sample report for the test
report := models.Report{
UserID: 1,
AlertCount: 30,
AnalysisTime: 3600,
Predict: "Good",
Type: "Study",
CreatedAt: time.Now(),
UserID: 1,
AlertCount: 30,
AnalysisTime: 3600,
Type: "Study",
Predict: "Good",
Score: "90.000",
NormalRatio: "90.000",
NeckAngles: "angle",
Distances: "distance",
StatusFrequencies: "status",
CreatedAt: time.Now(),
}

// Set up expectations for the mock DB to return the sample report
mock.ExpectBegin()
mock.ExpectExec("INSERT INTO `reports`").
WithArgs(report.UserID, report.AlertCount, report.AnalysisTime, report.Type, report.Predict, report.CreatedAt).
WithArgs(report.UserID, report.AlertCount, report.AnalysisTime, report.Type, report.Predict, report.Score, report.NormalRatio, report.NeckAngles, report.Distances, report.StatusFrequencies, report.CreatedAt).
WillReturnResult(sqlmock.NewResult(1, 1))
mock.ExpectCommit()

Expand All @@ -375,8 +418,8 @@ func TestReportRepository_FindByYearAndMonth(t *testing.T) {
// Set up expectations for the mock DB to return the sample report
mock.ExpectQuery("SELECT \\* FROM `reports` WHERE user_id = \\? AND DATE_FORMAT\\(created_at, '%Y%m'\\) = \\?").
WithArgs(savedReport.UserID, yearAndMonth).
WillReturnRows(sqlmock.NewRows([]string{"id", "user_id", "alert_count", "analysis_time", "type", "predict", "created_at"}).
AddRow(savedReport.ID, savedReport.UserID, savedReport.AlertCount, savedReport.AnalysisTime, savedReport.Type, savedReport.Predict, savedReport.CreatedAt))
WillReturnRows(sqlmock.NewRows([]string{"id", "user_id", "alert_count", "analysis_time", "type", "predict", "score", "normal_ratio", "neck_angles", "distances", "status_frequencies", "created_at"}).
AddRow(savedReport.ID, savedReport.UserID, savedReport.AlertCount, savedReport.AnalysisTime, savedReport.Type, savedReport.Predict, savedReport.Score, savedReport.NormalRatio, savedReport.NeckAngles, savedReport.Distances, savedReport.StatusFrequencies, savedReport.CreatedAt))

// Call the method under test
reports, err := reportRepository.FindByYearAndMonth(savedReport.UserID, yearAndMonth)
Expand All @@ -391,8 +434,14 @@ func TestReportRepository_FindByYearAndMonth(t *testing.T) {
assert.Equal(t, savedReport.UserID, reports[0].UserID)
assert.Equal(t, savedReport.AlertCount, reports[0].AlertCount)
assert.Equal(t, savedReport.AnalysisTime, reports[0].AnalysisTime)
assert.Equal(t, savedReport.Predict, reports[0].Predict)
assert.Equal(t, savedReport.Type, reports[0].Type)
assert.Equal(t, savedReport.Predict, reports[0].Predict)
assert.Equal(t, savedReport.Score, reports[0].Score)
assert.Equal(t, savedReport.NormalRatio, reports[0].NormalRatio)
assert.Equal(t, savedReport.NeckAngles, reports[0].NeckAngles)
assert.Equal(t, savedReport.Distances, reports[0].Distances)
assert.Equal(t, savedReport.StatusFrequencies, reports[0].StatusFrequencies)
assert.Equal(t, savedReport.CreatedAt, reports[0].CreatedAt)
}

func TestReportRepository_FindByYearAndMonth_Error(t *testing.T) {
Expand Down Expand Up @@ -457,18 +506,23 @@ func TestReportRepository_FindAll(t *testing.T) {

// Create sample report for the test
report := models.Report{
UserID: 1,
AlertCount: 30,
AnalysisTime: 3600,
Predict: "Good",
Type: "Study",
CreatedAt: time.Now(),
UserID: 1,
AlertCount: 30,
AnalysisTime: 3600,
Type: "Study",
Predict: "Good",
Score: "90.000",
NormalRatio: "90.000",
NeckAngles: "angle",
Distances: "distance",
StatusFrequencies: "status",
CreatedAt: time.Now(),
}

// Set up expectations for the mock DB to return the sample report
mock.ExpectBegin()
mock.ExpectExec("INSERT INTO `reports`").
WithArgs(report.UserID, report.AlertCount, report.AnalysisTime, report.Type, report.Predict, report.CreatedAt).
WithArgs(report.UserID, report.AlertCount, report.AnalysisTime, report.Type, report.Predict, report.Score, report.NormalRatio, report.NeckAngles, report.Distances, report.StatusFrequencies, report.CreatedAt).
WillReturnResult(sqlmock.NewResult(1, 1))
mock.ExpectCommit()

Expand All @@ -480,8 +534,8 @@ func TestReportRepository_FindAll(t *testing.T) {

// Set up expectations for the mock DB to return the sample report
mock.ExpectQuery("SELECT \\* FROM `reports`").
WillReturnRows(sqlmock.NewRows([]string{"id", "user_id", "alert_count", "analysis_time", "type", "predict", "created_at"}).
AddRow(savedReport.ID, savedReport.UserID, savedReport.AlertCount, savedReport.AnalysisTime, savedReport.Type, savedReport.Predict, savedReport.CreatedAt))
WillReturnRows(sqlmock.NewRows([]string{"id", "user_id", "alert_count", "analysis_time", "type", "predict", "score", "normal_ratio", "neck_angles", "distances", "status_frequencies", "created_at"}).
AddRow(savedReport.ID, savedReport.UserID, savedReport.AlertCount, savedReport.AnalysisTime, savedReport.Type, savedReport.Predict, savedReport.Score, savedReport.NormalRatio, savedReport.NeckAngles, savedReport.Distances, savedReport.StatusFrequencies, savedReport.CreatedAt))

// Call the method under test
reports, err := reportRepository.FindAll()
Expand All @@ -496,8 +550,14 @@ func TestReportRepository_FindAll(t *testing.T) {
assert.Equal(t, savedReport.UserID, reports[0].UserID)
assert.Equal(t, savedReport.AlertCount, reports[0].AlertCount)
assert.Equal(t, savedReport.AnalysisTime, reports[0].AnalysisTime)
assert.Equal(t, savedReport.Predict, reports[0].Predict)
assert.Equal(t, savedReport.Type, reports[0].Type)
assert.Equal(t, savedReport.Predict, reports[0].Predict)
assert.Equal(t, savedReport.Score, reports[0].Score)
assert.Equal(t, savedReport.NormalRatio, reports[0].NormalRatio)
assert.Equal(t, savedReport.NeckAngles, reports[0].NeckAngles)
assert.Equal(t, savedReport.Distances, reports[0].Distances)
assert.Equal(t, savedReport.StatusFrequencies, reports[0].StatusFrequencies)
assert.Equal(t, savedReport.CreatedAt, reports[0].CreatedAt)
}

func TestReportRepository_FindAll_Error(t *testing.T) {
Expand Down
Loading
Loading