Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions cmd/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ func main() {
adminHandler.SetMembershipInvoices(membershipInvoiceRepo)
adminHandler.SetLostItems(lostItemRepo)
adminHandler.SetRideStops(rideStopRepo)
adminHandler.SetRatings(rideRatingRepo) // B5:司機列表評價欄+訂單詳情該趟評分

// 乘客認證:註冊/登入(line_user_id + 密碼 JWT)
customerRegistry := service.NewCustomerRegistry(customerRepo)
Expand Down
48 changes: 47 additions & 1 deletion internal/handler/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,18 @@ type AdminHandler struct {
membershipInvoices *repository.MembershipInvoiceRepository
lostItems *repository.LostItemRepository
rideStops *repository.RideStopRepository
ratings *repository.RideRatingRepository
redis *redisstore.Store
jwtSecret string
jwtExpiryHours int
}

// SetRatings 注入評分 repo(司機列表的評價欄、訂單詳情的該趟評分);可選——
// 未注入時兩處都不帶 rating 欄位,既有回應形狀一個欄位不少。
func (h *AdminHandler) SetRatings(ratings *repository.RideRatingRepository) {
h.ratings = ratings
}

// SetFeeSettings 注入費率設定服務(供 /settings/fees 讀寫);可選。
func (h *AdminHandler) SetFeeSettings(fs *service.FeeSettings) {
h.feeSettings = fs
Expand Down Expand Up @@ -134,13 +141,44 @@ func (h *AdminHandler) Fleet(c *gin.Context) {
}

// Drivers GET /api/admin/drivers:司機列表
// adminDriverView 後台司機列表的單列:司機全欄位 + 評價彙總(B5)。
//
// 內嵌 *model.Driver 讓 JSON 攤平,既有欄位一個不少——前端讀到的形狀只多不變。
// **沒評分的司機一律回 (0, 0) 而不是省略欄位**:前端據 rating_count 判斷要顯示
// 「尚無評分」還是分數,缺鍵會讓它得多判一種 undefined。
type adminDriverView struct {
*model.Driver
RatingAvg float64 `json:"rating_avg"`
RatingCount int64 `json:"rating_count"`
}

func (h *AdminHandler) Drivers(c *gin.Context) {
drivers, err := h.drivers.ListAll()
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
c.JSON(http.StatusOK, gin.H{"drivers": drivers})
if h.ratings == nil {
c.JSON(http.StatusOK, gin.H{"drivers": drivers})
return
}
ids := make([]int64, 0, len(drivers))
for i := range drivers {
ids = append(ids, drivers[i].ID)
}
// 評分查失敗**不擋司機列表**——那是營運每天在用的主畫面,
// 不該因為加值欄位取不到就整頁壞掉(比照 /driver/me 的處理)。
summaries, err := h.ratings.SummaryByDrivers(ids)
if err != nil {
c.JSON(http.StatusOK, gin.H{"drivers": drivers})
return
}
views := make([]adminDriverView, 0, len(drivers))
for i := range drivers {
s := summaries[drivers[i].ID] // 沒評分者為零值
views = append(views, adminDriverView{Driver: &drivers[i], RatingAvg: s.Average, RatingCount: s.Count})
}
c.JSON(http.StatusOK, gin.H{"drivers": views})
}

const rideListDateLayout = "2006-01-02"
Expand Down Expand Up @@ -287,6 +325,14 @@ func (h *AdminHandler) RideDetail(c *gin.Context) {
}
}
}
// 該趟的乘客評分(B5):客服要能回答「這位乘客給了幾分、寫了什麼」。
// **未評分時整個鍵不出現**(與乘客端 CustomerRideView.rating 同一約定),
// 讀取失敗同樣不擋詳情頁。
if h.ratings != nil {
if rating, err := h.ratings.FindByRide(id); err == nil && rating != nil {
resp["rating"] = rating
}
}
c.JSON(http.StatusOK, resp)
}

Expand Down
29 changes: 29 additions & 0 deletions internal/repository/ride_rating.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,32 @@ func (r *RideRatingRepository) SummaryByDriver(driverID int64) (DriverRatingSumm
}
return summary, nil
}

// SummaryByDrivers 一次取多位司機的評分彙總(後台司機列表用)。
//
// **一條 GROUP BY 取代逐列查詢**:司機列表動輒數十列,每列各打一次
// SummaryByDriver 就是 N+1。回傳的 map 只含**有評分的**司機,
// 沒評分的司機呼叫端自行以零值呈現(「尚無評分」不是缺資料,是常態)。
func (r *RideRatingRepository) SummaryByDrivers(driverIDs []int64) (map[int64]DriverRatingSummary, error) {
out := make(map[int64]DriverRatingSummary, len(driverIDs))
if len(driverIDs) == 0 {
return out, nil
}
var rows []struct {
DriverID int64
Avg float64
Count int64
}
err := r.db.Model(&model.RideRating{}).
Select("driver_id", "AVG(score) AS avg", "COUNT(*) AS count").
Where("driver_id IN ?", driverIDs).
Group("driver_id").
Scan(&rows).Error
if err != nil {
return nil, err
}
for _, row := range rows {
out[row.DriverID] = DriverRatingSummary{Average: row.Avg, Count: row.Count}
}
return out, nil
}
64 changes: 64 additions & 0 deletions internal/service/rating_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,67 @@ func TestCustomerRideViewCarriesRating(t *testing.T) {
t.Fatalf("歷史列表沒有這趟行程(%d)", rideID)
}
}

// TestRatingSummaryByDrivers 批次彙總(後台司機列表用):一條 GROUP BY 取代 N+1。
// **沒評分的司機不出現在 map 裡**,呼叫端以零值呈現「尚無評分」。
func TestRatingSummaryByDrivers(t *testing.T) {
db := newServiceTestDB(t)
customers := repository.NewCustomerRepository(db)
drivers := repository.NewDriverRepository(db)
rides := repository.NewRideRepository(db)
ratings := repository.NewRideRatingRepository(db)

owner, err := customers.FindOrCreateByLineUserID("U_batch_owner", "評分乘客")
if err != nil {
t.Fatalf("建立乘客失敗:%v", err)
}
d1, err := drivers.FindOrCreate("U_batch_d1", "司機一")
if err != nil {
t.Fatalf("建立司機失敗:%v", err)
}
d2, err := drivers.FindOrCreate("U_batch_d2", "司機二")
if err != nil {
t.Fatalf("建立司機失敗:%v", err)
}
d3, err := drivers.FindOrCreate("U_batch_d3", "沒被評過的司機")
if err != nil {
t.Fatalf("建立司機失敗:%v", err)
}

svc := NewRatingService(rides, ratings)
// 司機一:5 與 3 → 平均 4;司機二:2 → 平均 2;司機三:無評分
for _, tc := range []struct {
driverID int64
score int
}{{d1.ID, 5}, {d1.ID, 3}, {d2.ID, 2}} {
rideID := completedRideForRating(t, rides, owner.ID, tc.driverID)
if _, err := svc.RateByCustomer(owner.ID, rideID, tc.score, ""); err != nil {
t.Fatalf("評分失敗:%v", err)
}
}

got, err := ratings.SummaryByDrivers([]int64{d1.ID, d2.ID, d3.ID})
if err != nil {
t.Fatalf("批次彙總失敗:%v", err)
}
if s := got[d1.ID]; s.Count != 2 || s.Average != 4 {
t.Fatalf("司機一應為 4 分/2 則,得到 %+v", s)
}
if s := got[d2.ID]; s.Count != 1 || s.Average != 2 {
t.Fatalf("司機二應為 2 分/1 則,得到 %+v", s)
}
if _, ok := got[d3.ID]; ok {
t.Fatalf("沒評分的司機不該出現在 map 裡(呼叫端以零值呈現「尚無評分」)")
}
// 與逐列查詢一致——批次是為了效能,不是為了不同的答案
single, err := svc.SummaryByDriver(d1.ID)
if err != nil || single.Average != got[d1.ID].Average || single.Count != got[d1.ID].Count {
t.Fatalf("批次與逐列結果不一致:%+v vs %+v(err=%v)", got[d1.ID], single, err)
}

// 空清單不該打 DB,也不該爆
empty, err := ratings.SummaryByDrivers(nil)
if err != nil || len(empty) != 0 {
t.Fatalf("空清單應回空 map,得到 %+v(err=%v)", empty, err)
}
}
Loading