gitea-admin/lti-api
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-api.git synced 2026-05-20 13:31:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/umur' into 'development'

Browse Source 
[FEAT][BE]: adjust calculate umur ayam at recording

See merge request mbugroup/lti-api!500
This commit is contained in:
Giovanni Gabriel Septriadi
2026-05-04 06:38:19 +00:00
parent 916fa4205b 0ac40adb5a
commit 03474dc1fa
5 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/common/service/common.depreciation.service.go
+1 -1
View File
@@ -31,7 +31,7 @@ func FlockAgeDay(originDate time.Time, periodDate time.Time) int {
if period.Before(origin) { if period.Before(origin) {
return 0 return 0
} }
return int(period.Sub(origin).Hours()/24) + 1 return int(period.Sub(origin).Hours() / 24)
} }
func DepreciationScheduleDay(originDate time.Time, periodDate time.Time, houseType string) int { func DepreciationScheduleDay(originDate time.Time, periodDate time.Time, houseType string) int {
internal/database/migrations/20260504035824_adjust_recording_day_zero_indexed.down.sql
+14
View File
@@ -0,0 +1,14 @@
UPDATE recordings r
SET day = (
SELECT (r.record_datetime::date - MIN(pc.chick_in_date)::date)::int + 1
FROM project_chickins pc
WHERE pc.project_flock_kandang_id = r.project_flock_kandangs_id
AND pc.deleted_at IS NULL
)
WHERE r.deleted_at IS NULL
AND (
SELECT MIN(pc.chick_in_date)
FROM project_chickins pc
WHERE pc.project_flock_kandang_id = r.project_flock_kandangs_id
AND pc.deleted_at IS NULL
) IS NOT NULL;
internal/database/migrations/20260504035824_adjust_recording_day_zero_indexed.up.sql
+14
View File
@@ -0,0 +1,14 @@
UPDATE recordings r
SET day = (
SELECT (r.record_datetime::date - MIN(pc.chick_in_date)::date)::int
FROM project_chickins pc
WHERE pc.project_flock_kandang_id = r.project_flock_kandangs_id
AND pc.deleted_at IS NULL
)
WHERE r.deleted_at IS NULL
AND (
SELECT MIN(pc.chick_in_date)
FROM project_chickins pc
WHERE pc.project_flock_kandang_id = r.project_flock_kandangs_id
AND pc.deleted_at IS NULL
) IS NOT NULL;
internal/modules/dashboards/repositories/dashboard_stats.repository.go
+15 -15
View File
@@ -119,9 +119,9 @@ func (r *DashboardRepositoryImpl) GetRecordingWeeklyMetrics(ctx context.Context,
var rows []RecordingWeeklyMetric var rows []RecordingWeeklyMetric
weekExpr := `CASE weekExpr := `CASE
WHEN r.day IS NULL OR r.day <= 0 THEN 1 WHEN r.day IS NULL OR r.day < 0 THEN 1
WHEN UPPER(pf.category) = 'LAYING' THEN ((r.day - 1) / 7 + 1) + 17 WHEN UPPER(pf.category) = 'LAYING' THEN (r.day / 7 + 1) + 17
ELSE ((r.day - 1) / 7 + 1) ELSE (r.day / 7 + 1)
END` END`
db := r.DB().WithContext(ctx). db := r.DB().WithContext(ctx).
@@ -503,9 +503,9 @@ func (r *DashboardRepositoryImpl) GetComparisonWeeklyMetrics(ctx context.Context
var rows []ComparisonWeeklyMetric var rows []ComparisonWeeklyMetric
weekExpr := `CASE weekExpr := `CASE
WHEN r.day IS NULL OR r.day <= 0 THEN 1 WHEN r.day IS NULL OR r.day < 0 THEN 1
WHEN UPPER(pf.category) = 'LAYING' THEN ((r.day - 1) / 7 + 1) + 17 WHEN UPPER(pf.category) = 'LAYING' THEN (r.day / 7 + 1) + 17
ELSE ((r.day - 1) / 7 + 1) ELSE (r.day / 7 + 1)
END` END`
db := r.DB().WithContext(ctx). db := r.DB().WithContext(ctx).
@@ -574,9 +574,9 @@ func (r *DashboardRepositoryImpl) GetEggQualityWeeklyMetrics(ctx context.Context
var rows []EggQualityWeeklyMetric var rows []EggQualityWeeklyMetric
weekExpr := `CASE weekExpr := `CASE
WHEN r.day IS NULL OR r.day <= 0 THEN 1 WHEN r.day IS NULL OR r.day < 0 THEN 1
WHEN UPPER(pf.category) = 'LAYING' THEN ((r.day - 1) / 7 + 1) + 17 WHEN UPPER(pf.category) = 'LAYING' THEN (r.day / 7 + 1) + 17
ELSE ((r.day - 1) / 7 + 1) ELSE (r.day / 7 + 1)
END` END`
db := r.DB().WithContext(ctx). db := r.DB().WithContext(ctx).
@@ -616,9 +616,9 @@ func (r *DashboardRepositoryImpl) GetEggWeightWeeklyGrams(ctx context.Context, s
var rows []WeeklyEggWeightMetric var rows []WeeklyEggWeightMetric
weekExpr := `CASE weekExpr := `CASE
WHEN r.day IS NULL OR r.day <= 0 THEN 1 WHEN r.day IS NULL OR r.day < 0 THEN 1
WHEN UPPER(pf.category) = 'LAYING' THEN ((r.day - 1) / 7 + 1) + 17 WHEN UPPER(pf.category) = 'LAYING' THEN (r.day / 7 + 1) + 17
ELSE ((r.day - 1) / 7 + 1) ELSE (r.day / 7 + 1)
END` END`
db := r.DB().WithContext(ctx). db := r.DB().WithContext(ctx).
@@ -647,9 +647,9 @@ func (r *DashboardRepositoryImpl) GetFeedUsageWeeklyByUom(ctx context.Context, s
var rows []WeeklyFeedUsageMetric var rows []WeeklyFeedUsageMetric
weekExpr := `CASE weekExpr := `CASE
WHEN r.day IS NULL OR r.day <= 0 THEN 1 WHEN r.day IS NULL OR r.day < 0 THEN 1
WHEN UPPER(pf.category) = 'LAYING' THEN ((r.day - 1) / 7 + 1) + 17 WHEN UPPER(pf.category) = 'LAYING' THEN (r.day / 7 + 1) + 17
ELSE ((r.day - 1) / 7 + 1) ELSE (r.day / 7 + 1)
END` END`
db := r.DB().WithContext(ctx). db := r.DB().WithContext(ctx).
internal/modules/production/recordings/services/recording.service.go
+3 -3
View File
@@ -2460,7 +2460,7 @@ func (s *recordingService) computeRecordingDay(ctx context.Context, projectFlock
return 0, fiber.NewError(fiber.StatusBadRequest, "Record date tidak boleh sebelum tanggal chick in") return 0, fiber.NewError(fiber.StatusBadRequest, "Record date tidak boleh sebelum tanggal chick in")
} }
return diff + 1, nil return diff, nil
} }
func (s *recordingService) computeAndUpdateMetrics(ctx context.Context, tx *gorm.DB, recording *entity.Recording) error { func (s *recordingService) computeAndUpdateMetrics(ctx context.Context, tx *gorm.DB, recording *entity.Recording) error {
@@ -2621,8 +2621,8 @@ func (s *recordingService) computeAndUpdateMetrics(ctx context.Context, tx *gorm
if isGrowing { if isGrowing {
week := 0 week := 0
if recording.Day != nil && *recording.Day > 0 { if recording.Day != nil && *recording.Day >= 0 {
week = (*recording.Day-1)/7 + 1 week = *recording.Day/7 + 1
} }
if week > 0 && s.Repository != nil { if week > 0 && s.Repository != nil {
meanBw, ok, err := s.Repository.GetUniformityMeanBwByWeek(tx, recording.ProjectFlockKandangId, week) meanBw, ok, err := s.Repository.GetUniformityMeanBwByWeek(tx, recording.ProjectFlockKandangId, week)