feat: filter purchase tasks by successful SYB order writeback (#327)
This commit is contained in:
@@ -109,6 +109,9 @@ type AdminDetailResponse struct {
|
||||
Matching MatchingView `json:"matching"`
|
||||
}
|
||||
|
||||
// Query-only value: never a PurchaseTask status or a logistics writeback state.
|
||||
const adminStatusSYBWritebackSucceeded = "syb_writeback_succeeded"
|
||||
|
||||
func (s *Service) AdminList(ctx context.Context, req AdminListRequest) (AdminListResponse, error) {
|
||||
if req.Page < 1 {
|
||||
req.Page = 1
|
||||
@@ -119,7 +122,7 @@ func (s *Service) AdminList(ctx context.Context, req AdminListRequest) (AdminLis
|
||||
if req.PageSize > 100 {
|
||||
req.PageSize = 100
|
||||
}
|
||||
if req.Status != "" && !validPurchaseStatus(req.Status) {
|
||||
if req.Status != "" && req.Status != adminStatusSYBWritebackSucceeded && !validPurchaseStatus(req.Status) {
|
||||
return AdminListResponse{}, fail(CodeInvalidRequest, "status 无效")
|
||||
}
|
||||
if req.ExecutionMode != "" && req.ExecutionMode != models.PurchaseExecutionModeRehearsal && req.ExecutionMode != models.PurchaseExecutionModeLive {
|
||||
@@ -132,7 +135,9 @@ func (s *Service) AdminList(ctx context.Context, req AdminListRequest) (AdminLis
|
||||
if req.TaskID > 0 {
|
||||
query = query.Where("id = ?", req.TaskID)
|
||||
}
|
||||
if req.Status != "" {
|
||||
if req.Status == adminStatusSYBWritebackSucceeded {
|
||||
query = query.Where("id IN (?)", s.DB.WithContext(ctx).Model(&models.PurchaseOrderWriteback{}).Select("purchase_task_id").Where("status = ?", "succeeded"))
|
||||
} else if req.Status != "" {
|
||||
query = query.Where("status = ?", req.Status)
|
||||
}
|
||||
if req.ExecutionMode != "" {
|
||||
|
||||
@@ -105,6 +105,63 @@ func TestAdminQueryValidationAndNotFound(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestAdminListSYBWritebackSucceededFilter(t *testing.T) {
|
||||
s, first := orderWritebackFixture(t)
|
||||
db := s.DB
|
||||
if err := db.Model(&models.PurchaseOrderWriteback{}).Where("purchase_task_id = ?", first.ID).Update("status", "succeeded").Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var successIDs []uint64
|
||||
successIDs = append(successIDs, first.ID)
|
||||
for _, state := range []string{"succeeded", "pending", "running", "failed", "unknown", "conflict", "none"} {
|
||||
task := first
|
||||
task.ID = 0
|
||||
task.Status = models.PurchaseTaskStatusCancelled
|
||||
task.PDDOrderNo = nil
|
||||
task.WritebackStatus = models.PurchaseWritebackStatusSucceeded // old logistics must not match
|
||||
task.CreateRequestID = uuid.NewString()
|
||||
task.UnknownResolveRequestID = nil
|
||||
if err := db.Create(&task).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if state != "none" {
|
||||
if err := db.Create(&models.PurchaseOrderWriteback{PurchaseTaskID: task.ID, StockID: 2, DetailID: 1, OrderNo: "FILTER-DEMO", Status: state}).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
if state == "succeeded" {
|
||||
successIDs = append(successIDs, task.ID)
|
||||
}
|
||||
}
|
||||
for page := 1; page <= 2; page++ {
|
||||
out, err := s.AdminList(context.Background(), AdminListRequest{Status: adminStatusSYBWritebackSucceeded, Page: page, PageSize: 1})
|
||||
if err != nil || out.Total != 2 || len(out.Items) != 1 || out.Items[0].ID != successIDs[2-page] {
|
||||
t.Fatalf("page %d: %+v, %v", page, out, err)
|
||||
}
|
||||
}
|
||||
for _, req := range []AdminListRequest{
|
||||
{Status: adminStatusSYBWritebackSucceeded, TaskID: first.ID},
|
||||
{Status: models.PurchaseTaskStatusOrderCreated},
|
||||
{Status: adminStatusSYBWritebackSucceeded, PDDOrderNo: *first.PDDOrderNo, ExecutionMode: "live", TaskType: "syb_order", SYBProductID: *first.SYBProductID},
|
||||
} {
|
||||
out, err := s.AdminList(context.Background(), req)
|
||||
if err != nil || out.Total != 1 || len(out.Items) != 1 || out.Items[0].ID != first.ID {
|
||||
t.Fatalf("combined filter: %+v %v", out, err)
|
||||
}
|
||||
}
|
||||
out, err := s.AdminList(context.Background(), AdminListRequest{})
|
||||
if err != nil || out.Total != 8 {
|
||||
t.Fatalf("clear filter: %+v %v", out, err)
|
||||
}
|
||||
out, err = s.AdminList(context.Background(), AdminListRequest{Status: adminStatusSYBWritebackSucceeded, PDDOrderNo: "not-found"})
|
||||
if err != nil || out.Total != 0 {
|
||||
t.Fatalf("empty filter: %+v %v", out, err)
|
||||
}
|
||||
if validPurchaseStatus(adminStatusSYBWritebackSucceeded) {
|
||||
t.Fatal("filter became task state")
|
||||
}
|
||||
}
|
||||
|
||||
func TestAdminQueryHandlersRequireOperatorRole(t *testing.T) {
|
||||
gin.SetMode(gin.TestMode)
|
||||
for _, path := range []string{"/api/admin/v1/purchase-tasks", "/api/admin/v1/purchase-tasks/1"} {
|
||||
|
||||
Reference in New Issue
Block a user