feat/BE/US-76/US-78/US-79/TASK-112,120,133,121-Recording growing/TASK-187,189,202,190-Recording Laying/TASK-191,192,194,197,203-Grading Telur

internal/entities/projectflock.go

@@ -8,18 +8,17 @@ import (
 
 type ProjectFlock struct {
 	Id         uint           `gorm:"primaryKey"`
-	FlockId    uint           `gorm:"not null;uniqueIndex:project_flocks_flock_period_unique"`
+	FlockName  string         `gorm:"type:varchar(255);not null;uniqueIndex"`
 	AreaId     uint           `gorm:"not null"`
 	Category   string         `gorm:"type:varchar(20);not null"`
 	FcrId      uint           `gorm:"not null"`
 	LocationId uint           `gorm:"not null"`
-	Period     int            `gorm:"not null;uniqueIndex:project_flocks_flock_period_unique"`
+	Period     int            `gorm:"not null"`
 	CreatedBy  uint           `gorm:"not null"`
 	CreatedAt  time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt  time.Time      `gorm:"autoUpdateTime"`
 	DeletedAt  gorm.DeletedAt `gorm:"index" json:"-"`
 
-	Flock          Flock                 `gorm:"foreignKey:FlockId;references:Id"`
 	Area           Area                  `gorm:"foreignKey:AreaId;references:Id"`
 	Fcr            Fcr                   `gorm:"foreignKey:FcrId;references:Id"`
 	Location       Location              `gorm:"foreignKey:LocationId;references:Id"`

internal/entities/recording.go

@@ -8,20 +8,16 @@ import (
 
 type Recording struct {
 	Id                    uint           `gorm:"primaryKey"`
-	ProjectFlockKandangId uint           `gorm:"column:project_flock_id;not null;index"`
+	ProjectFlockKandangId uint           `gorm:"column:project_flock_kandangs_id;not null;index"`
 	RecordDatetime        time.Time      `gorm:"column:record_datetime;not null"`
-	RecordDate            *time.Time     `gorm:"column:record_date"`
-	Ontime                int            `gorm:"column:ontime;not null;default:0"`
 	Day                   *int           `gorm:"column:day"`
-	TotalDepletion        *int           `gorm:"column:total_depletion"`
+	TotalDepletionQty     *float64       `gorm:"column:total_depletion_qty"`
 	CumDepletionRate      *float64       `gorm:"column:cum_depletion_rate"`
 	DailyGain             *float64       `gorm:"column:daily_gain"`
 	AvgDailyGain          *float64       `gorm:"column:avg_daily_gain"`
-	CumIntake             *int64         `gorm:"column:cum_intake"`
+	CumIntake             *int           `gorm:"column:cum_intake"`
 	FcrValue              *float64       `gorm:"column:fcr_value"`
-	TotalChick            *int64         `gorm:"column:total_chick"`
-	DailyDepletionRate    *float64       `gorm:"column:daily_depletion_rate"`
-	CumDepletion          *int           `gorm:"column:cum_depletion"`
+	TotalChickQty         *float64       `gorm:"column:total_chick_qty"`
 	CreatedBy             uint           `gorm:"column:created_by"`
 	CreatedAt             time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt             time.Time      `gorm:"autoUpdateTime"`
@@ -32,4 +28,7 @@ type Recording struct {
 	BodyWeights         []RecordingBW        `gorm:"foreignKey:RecordingId;references:Id"`
 	Depletions          []RecordingDepletion `gorm:"foreignKey:RecordingId;references:Id"`
 	Stocks              []RecordingStock     `gorm:"foreignKey:RecordingId;references:Id"`
+	Eggs                []RecordingEgg       `gorm:"foreignKey:RecordingId;references:Id"`
+
+	LatestApproval *Approval `gorm:"-" json:"-"`
 }

internal/entities/recording_bw.go

@@ -1,16 +1,15 @@
-
 package entities
 
 import "time"
 
 type RecordingBW struct {
-    Id          uint      `gorm:"primaryKey"`
-    RecordingId uint      `gorm:"column:recording_id;not null;index"`
-    Weight      float64   `gorm:"column:weight;not null"`
-    Qty         int       `gorm:"column:qty;not null;default:1"`
-    Notes       *string   `gorm:"column:notes"`
-    CreatedAt   time.Time `gorm:"autoCreateTime"`
-    UpdatedAt   time.Time `gorm:"autoUpdateTime"`
+	Id          uint      `gorm:"primaryKey"`
+	RecordingId uint      `gorm:"column:recording_id;not null;index"`
+	AvgWeight   float64   `gorm:"column:avg_weight;not null"`
+	Qty         float64   `gorm:"column:qty;not null"`
+	TotalWeight float64   `gorm:"column:total_weight;not null"`
+	CreatedAt   time.Time `gorm:"autoCreateTime"`
+	UpdatedAt   time.Time `gorm:"autoUpdateTime"`
 
-    Recording Recording `gorm:"foreignKey:RecordingId;references:Id"`
+	Recording Recording `gorm:"foreignKey:RecordingId;references:Id"`
 }

internal/entities/recording_depletion.go

@@ -1,13 +1,11 @@
 package entities
 
 type RecordingDepletion struct {
-    Id                 uint    `gorm:"primaryKey"`
-    RecordingId        uint    `gorm:"column:recording_id;not null;index"`
-    ProductWarehouseId uint    `gorm:"column:product_warehouse_id;not null"`
-    Total              int64   `gorm:"column:total;not null"`
-    Notes              *string `gorm:"column:notes"`
+	Id                 uint    `gorm:"primaryKey"`
+	RecordingId        uint    `gorm:"column:recording_id;not null;index"`
+	ProductWarehouseId uint    `gorm:"column:product_warehouse_id;not null"`
+	Qty                float64 `gorm:"column:qty;not null"`
 
-    Recording        Recording        `gorm:"foreignKey:RecordingId;references:Id"`
-    ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+	Recording        Recording        `gorm:"foreignKey:RecordingId;references:Id"`
+	ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
 }
-

internal/entities/recording_egg.go

@@ -0,0 +1,30 @@
+package entities
+
+import "time"
+
+type RecordingEgg struct {
+	Id                 uint             `gorm:"primaryKey"`
+	RecordingId        uint             `gorm:"column:recording_id;not null;index"`
+	ProductWarehouseId uint             `gorm:"column:product_warehouse_id;not null"`
+	Qty                int              `gorm:"column:qty;not null"`
+	CreatedBy          uint             `gorm:"column:created_by"`
+	CreatedAt          time.Time        `gorm:"autoCreateTime"`
+	UpdatedAt          time.Time        `gorm:"autoUpdateTime"`
+	GradingEggs        []GradingEgg     `gorm:"foreignKey:RecordingEggId;references:Id"`
+	ProductWarehouse   ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+	CreatedUser        *User            `gorm:"foreignKey:CreatedBy;references:Id"`
+	Recording          Recording        `gorm:"foreignKey:RecordingId;references:Id"`
+}
+
+type GradingEgg struct {
+	Id             uint      `gorm:"primaryKey"`
+	RecordingEggId uint      `gorm:"column:recording_egg_id;not null;index"`
+	Qty            float64   `gorm:"column:qty;not null"`
+	Grade          string    `gorm:"column:grade;type:varchar(50)"`
+	CreatedBy      uint      `gorm:"column:created_by"`
+	CreatedAt      time.Time `gorm:"autoCreateTime"`
+	UpdatedAt      time.Time `gorm:"autoUpdateTime"`
+
+	RecordingEgg RecordingEgg `gorm:"foreignKey:RecordingEggId;references:Id"`
+	CreatedUser  *User        `gorm:"foreignKey:CreatedBy;references:Id"`
+}

internal/entities/recording_stock.go

@@ -1,14 +1,12 @@
 package entities
 
 type RecordingStock struct {
-    Id                 uint     `gorm:"primaryKey"`
-    RecordingId        uint     `gorm:"column:recording_id;not null;index"`
-    ProductWarehouseId uint     `gorm:"column:product_warehouse_id;not null"`
-    Increase           *float64 `gorm:"column:increase"`
-    Decrease           *float64 `gorm:"column:decrease"`
-    UsageAmount        *int64   `gorm:"column:usage_amount"`
-    Notes              *string  `gorm:"column:notes"`
+	Id                 uint     `gorm:"primaryKey"`
+	RecordingId        uint     `gorm:"column:recording_id;not null;index"`
+	ProductWarehouseId uint     `gorm:"column:product_warehouse_id;not null"`
+	UsageQty           *float64 `gorm:"column:usage_qty"`
+	PendingQty         *float64 `gorm:"column:pending_qty"`
 
-    Recording        Recording        `gorm:"foreignKey:RecordingId;references:Id"`
-    ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+	Recording        Recording        `gorm:"foreignKey:RecordingId;references:Id"`
+	ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
 }