Add visitor phone lookup flow
This commit is contained in:
@@ -27,29 +27,113 @@ func (s *Server) publicStatus(w http.ResponseWriter, r *http.Request) {
|
||||
writeError(w, mapNotFound(err, "STATUS_NOT_FOUND", "排队状态不存在或链接已失效"))
|
||||
return
|
||||
}
|
||||
var project model.Project
|
||||
var session model.QueueSession
|
||||
if err := s.db.WithContext(r.Context()).First(&project, "id = ?", ticket.ProjectID).Error; err != nil {
|
||||
writeError(w, err)
|
||||
return
|
||||
}
|
||||
if err := s.db.WithContext(r.Context()).First(&session, "id = ? AND project_id = ?", ticket.QueueSessionID, ticket.ProjectID).Error; err != nil {
|
||||
writeError(w, err)
|
||||
return
|
||||
}
|
||||
phoneSuffix, err := s.ticketPhoneLast4(ticket)
|
||||
view, err := s.publicStatusView(r.Context(), ticket)
|
||||
if err != nil {
|
||||
writeError(w, err)
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, view)
|
||||
}
|
||||
|
||||
type publicPhoneQueryRequest struct {
|
||||
Phone string `json:"phone"`
|
||||
}
|
||||
|
||||
// publicStatusByPhone is a temporary operational-test flow. It must be
|
||||
// replaced by OTP or an external identity provider before production use.
|
||||
func (s *Server) publicStatusByPhone(w http.ResponseWriter, r *http.Request) {
|
||||
if s.config.Environment == "production" {
|
||||
writeError(w, &apiError{Status: http.StatusNotFound, Code: "STATUS_NOT_FOUND", Message: "排队状态不存在或链接已失效"})
|
||||
return
|
||||
}
|
||||
if s.publicQueryLimiter != nil {
|
||||
if allowed, retry := s.publicQueryLimiter.allow("ip:" + publicQueryClientKey(r)); !allowed {
|
||||
writePublicQueryRateLimit(w, retry)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
var input publicPhoneQueryRequest
|
||||
if err := decodeJSON(r, &input); err != nil {
|
||||
writeError(w, err)
|
||||
return
|
||||
}
|
||||
phone, err := security.NormalizePhone(input.Phone)
|
||||
if err != nil {
|
||||
writeError(w, &apiError{Status: http.StatusUnprocessableEntity, Code: "INVALID_PHONE", Message: "请输入有效的手机号"})
|
||||
return
|
||||
}
|
||||
phoneDigest := s.cipher.Digest(phone)
|
||||
if s.publicQueryLimiter != nil {
|
||||
if allowed, retry := s.publicQueryLimiter.allow("phone:" + phoneDigest); !allowed {
|
||||
writePublicQueryRateLimit(w, retry)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
var tickets []model.QueueTicket
|
||||
if err := s.db.WithContext(r.Context()).Model(&model.QueueTicket{}).
|
||||
Joins("JOIN projects ON projects.id = queue_tickets.project_id").
|
||||
Joins("JOIN queue_sessions ON queue_sessions.id = queue_tickets.queue_session_id AND queue_sessions.project_id = queue_tickets.project_id").
|
||||
Where("queue_tickets.phone_hmac = ? AND queue_tickets.status IN ? AND queue_sessions.status IN ? AND projects.status IN ?",
|
||||
phoneDigest,
|
||||
[]string{model.TicketWaiting, model.TicketCalled, model.TicketArrived},
|
||||
[]string{"RUNNING", "PAUSED"},
|
||||
[]string{model.ProjectRunning, model.ProjectPaused}).
|
||||
Order("projects.name ASC, queue_tickets.ticket_number ASC").
|
||||
Find(&tickets).Error; err != nil {
|
||||
writeError(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
views := make([]map[string]any, 0, len(tickets))
|
||||
for _, ticket := range tickets {
|
||||
view, err := s.publicStatusView(r.Context(), ticket)
|
||||
if err != nil {
|
||||
writeError(w, err)
|
||||
return
|
||||
}
|
||||
views = append(views, view)
|
||||
}
|
||||
writeJSON(w, http.StatusOK, map[string]any{"tickets": views})
|
||||
}
|
||||
|
||||
func publicQueryClientKey(r *http.Request) string {
|
||||
if ip := remoteIP(r); ip != nil {
|
||||
return *ip
|
||||
}
|
||||
return "unknown"
|
||||
}
|
||||
|
||||
func writePublicQueryRateLimit(w http.ResponseWriter, retry time.Duration) {
|
||||
seconds := int((retry + time.Second - 1) / time.Second)
|
||||
if seconds < 1 {
|
||||
seconds = 1
|
||||
}
|
||||
w.Header().Set("Retry-After", fmt.Sprintf("%d", seconds))
|
||||
writeError(w, &apiError{Status: http.StatusTooManyRequests, Code: "PUBLIC_QUERY_RATE_LIMITED", Message: "查询次数过多,请稍后再试"})
|
||||
}
|
||||
|
||||
func (s *Server) publicStatusView(ctx context.Context, ticket model.QueueTicket) (map[string]any, error) {
|
||||
var project model.Project
|
||||
var session model.QueueSession
|
||||
if err := s.db.WithContext(ctx).First(&project, "id = ?", ticket.ProjectID).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := s.db.WithContext(ctx).First(&session, "id = ? AND project_id = ?", ticket.QueueSessionID, ticket.ProjectID).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
phoneSuffix, err := s.ticketPhoneLast4(ticket)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
peopleAhead := 0
|
||||
if ticket.Status == model.TicketWaiting {
|
||||
var count int64
|
||||
if err := s.db.WithContext(r.Context()).Model(&model.QueueTicket{}).
|
||||
if err := s.db.WithContext(ctx).Model(&model.QueueTicket{}).
|
||||
Where("project_id = ? AND queue_session_id = ? AND status = ? AND ticket_number < ?",
|
||||
ticket.ProjectID, ticket.QueueSessionID, model.TicketWaiting, ticket.TicketNumber).Count(&count).Error; err != nil {
|
||||
writeError(w, err)
|
||||
return
|
||||
return nil, err
|
||||
}
|
||||
peopleAhead = int(count)
|
||||
}
|
||||
@@ -57,12 +141,11 @@ func (s *Server) publicStatus(w http.ResponseWriter, r *http.Request) {
|
||||
DisplayNumber string `gorm:"column:display_number"`
|
||||
}
|
||||
latestCalledNumber := any(nil)
|
||||
if err := s.db.WithContext(r.Context()).Model(&model.QueueTicket{}).
|
||||
if err := s.db.WithContext(ctx).Model(&model.QueueTicket{}).
|
||||
Select("display_number").
|
||||
Where("project_id = ? AND queue_session_id = ? AND called_at IS NOT NULL", ticket.ProjectID, ticket.QueueSessionID).
|
||||
Order("called_at DESC, ticket_number DESC").First(&latestCalledTicket).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
writeError(w, err)
|
||||
return
|
||||
return nil, err
|
||||
} else if latestCalledTicket.DisplayNumber != "" {
|
||||
latestCalledNumber = latestCalledTicket.DisplayNumber
|
||||
}
|
||||
@@ -71,13 +154,12 @@ func (s *Server) publicStatus(w http.ResponseWriter, r *http.Request) {
|
||||
Running: project.Status == model.ProjectRunning && session.Status == "RUNNING" && ticket.Status == model.TicketWaiting,
|
||||
})
|
||||
if err != nil {
|
||||
writeError(w, err)
|
||||
return
|
||||
return nil, err
|
||||
}
|
||||
if ticket.Status != model.TicketWaiting {
|
||||
eta = domain.ETAResult{Available: false, Reason: "ticket_not_waiting"}
|
||||
}
|
||||
writeJSON(w, http.StatusOK, map[string]any{
|
||||
return map[string]any{
|
||||
"ticket_number": ticket.DisplayNumber, "display_number": ticket.DisplayNumber,
|
||||
"project_name": project.Name, "status": ticket.Status, "phone_last4": phoneSuffix, "estimated_wait": eta,
|
||||
"visitor_notice": project.VisitorNotice,
|
||||
@@ -90,7 +172,7 @@ func (s *Server) publicStatus(w http.ResponseWriter, r *http.Request) {
|
||||
"people_ahead": peopleAhead, "queue_position": queuePosition(ticket.Status, peopleAhead),
|
||||
"latest_called_number": latestCalledNumber,
|
||||
"eta": eta, "revision": session.Revision, "server_time": s.now(),
|
||||
})
|
||||
}, nil
|
||||
}
|
||||
|
||||
func queuePosition(status string, peopleAhead int) any {
|
||||
|
||||
Reference in New Issue
Block a user