feat(leads): add lead pipeline, keyword/status mapping, and encoding fixes
- Add lead ingestion, review queue, and keyword/status management - Add DB schema: leads, service_keywords, lead_statuses, processed_messages - Add migration with default keyword/status seeding per client - Fix SQLite read/write deadlock in sanitizeEncoding - Fix UTF-8 corruption: replace byte-iterating replaceAll with strings.ReplaceAll - Add utf8.ValidString guard to decodeLatin1 to avoid double-encoding - Remove hardcoded internal-secret; use config.InternalSecret() everywhere - Add .gitignore for binaries, SQLite DBs, build artifacts, WhatsApp sessions
This commit is contained in:
@@ -2,6 +2,7 @@ package db
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"time"
|
||||
)
|
||||
|
||||
type Client struct {
|
||||
@@ -19,13 +20,15 @@ type Client struct {
|
||||
}
|
||||
|
||||
type Customer struct {
|
||||
CustomerID int64 `json:"customer_id"`
|
||||
ClientID int64 `json:"client_id"`
|
||||
Name string `json:"name"`
|
||||
Phone string `json:"phone,omitempty"`
|
||||
BirthDate string `json:"birth_date,omitempty"`
|
||||
Instagram string `json:"instagram,omitempty"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
CustomerID int64 `json:"customer_id"`
|
||||
ClientID int64 `json:"client_id"`
|
||||
Name string `json:"name"`
|
||||
Phone string `json:"phone,omitempty"`
|
||||
BirthDate string `json:"birth_date,omitempty"`
|
||||
Instagram string `json:"instagram,omitempty"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
WhatsAppConnected int `json:"whatsapp_connected"`
|
||||
WhatsAppNumber string `json:"whatsapp_number,omitempty"`
|
||||
}
|
||||
|
||||
type Service struct {
|
||||
@@ -343,6 +346,283 @@ func boolToInt(b bool) int {
|
||||
return 0
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Lead
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
type Lead struct {
|
||||
LeadID int64 `json:"lead_id"`
|
||||
ClientID int64 `json:"client_id"`
|
||||
Name string `json:"name"`
|
||||
PhoneRaw string `json:"phone_raw"`
|
||||
PhoneNormalized string `json:"phone_normalized"`
|
||||
ServiceInterest string `json:"service_interest"`
|
||||
Status string `json:"status"`
|
||||
NeedsReview bool `json:"needs_review"`
|
||||
AppointmentDate string `json:"appointment_date,omitempty"`
|
||||
AppointmentTime string `json:"appointment_time,omitempty"`
|
||||
PaymentStatus string `json:"payment_status"`
|
||||
PaymentAmount float64 `json:"payment_amount,omitempty"`
|
||||
PaymentDate string `json:"payment_date,omitempty"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
LastContactAt int64 `json:"last_contact_at"`
|
||||
}
|
||||
|
||||
func CreateLead(db *sql.DB, l *Lead) error {
|
||||
now := time.Now().Unix()
|
||||
l.CreatedAt = now
|
||||
l.LastContactAt = now
|
||||
result, err := db.Exec(
|
||||
`INSERT INTO leads
|
||||
(client_id, name, phone_raw, phone_normalized, service_interest, status, needs_review,
|
||||
appointment_date, appointment_time, payment_status, payment_amount, payment_date, created_at, last_contact_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||
l.ClientID, l.Name, l.PhoneRaw, l.PhoneNormalized, l.ServiceInterest, l.Status, boolToInt(l.NeedsReview),
|
||||
l.AppointmentDate, l.AppointmentTime, l.PaymentStatus, l.PaymentAmount, l.PaymentDate,
|
||||
l.CreatedAt, l.LastContactAt,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
id, err := result.LastInsertId()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
l.LeadID = id
|
||||
return nil
|
||||
}
|
||||
|
||||
func GetLeadByPhone(db *sql.DB, clientID int64, phoneNormalized string) (*Lead, error) {
|
||||
var l Lead
|
||||
var needsReview int
|
||||
err := db.QueryRow(
|
||||
`SELECT lead_id, client_id, name, phone_raw, phone_normalized, service_interest, status, needs_review,
|
||||
COALESCE(appointment_date,''), COALESCE(appointment_time,''), payment_status,
|
||||
COALESCE(payment_amount,0), COALESCE(payment_date,''), created_at, last_contact_at
|
||||
FROM leads WHERE client_id = ? AND phone_normalized = ?`,
|
||||
clientID, phoneNormalized,
|
||||
).Scan(
|
||||
&l.LeadID, &l.ClientID, &l.Name, &l.PhoneRaw, &l.PhoneNormalized,
|
||||
&l.ServiceInterest, &l.Status, &needsReview,
|
||||
&l.AppointmentDate, &l.AppointmentTime, &l.PaymentStatus,
|
||||
&l.PaymentAmount, &l.PaymentDate, &l.CreatedAt, &l.LastContactAt,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
l.NeedsReview = needsReview == 1
|
||||
return &l, nil
|
||||
}
|
||||
|
||||
func GetLeadByID(db *sql.DB, clientID, leadID int64) (*Lead, error) {
|
||||
var l Lead
|
||||
var needsReview int
|
||||
err := db.QueryRow(
|
||||
`SELECT lead_id, client_id, name, phone_raw, phone_normalized, service_interest, status, needs_review,
|
||||
COALESCE(appointment_date,''), COALESCE(appointment_time,''), payment_status,
|
||||
COALESCE(payment_amount,0), COALESCE(payment_date,''), created_at, last_contact_at
|
||||
FROM leads WHERE lead_id = ? AND client_id = ?`,
|
||||
leadID, clientID,
|
||||
).Scan(
|
||||
&l.LeadID, &l.ClientID, &l.Name, &l.PhoneRaw, &l.PhoneNormalized,
|
||||
&l.ServiceInterest, &l.Status, &needsReview,
|
||||
&l.AppointmentDate, &l.AppointmentTime, &l.PaymentStatus,
|
||||
&l.PaymentAmount, &l.PaymentDate, &l.CreatedAt, &l.LastContactAt,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
l.NeedsReview = needsReview == 1
|
||||
return &l, nil
|
||||
}
|
||||
|
||||
func TouchLeadContact(db *sql.DB, leadID int64) error {
|
||||
_, err := db.Exec(
|
||||
"UPDATE leads SET last_contact_at = ? WHERE lead_id = ?",
|
||||
time.Now().Unix(), leadID,
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
func UpdateLead(db *sql.DB, l *Lead) error {
|
||||
_, err := db.Exec(
|
||||
`UPDATE leads SET name=?, service_interest=?, status=?, needs_review=?,
|
||||
appointment_date=?, appointment_time=?, payment_status=?, payment_amount=?, payment_date=?
|
||||
WHERE lead_id=? AND client_id=?`,
|
||||
l.Name, l.ServiceInterest, l.Status, boolToInt(l.NeedsReview),
|
||||
l.AppointmentDate, l.AppointmentTime, l.PaymentStatus, l.PaymentAmount, l.PaymentDate,
|
||||
l.LeadID, l.ClientID,
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
func ListLeadsForReview(db *sql.DB, clientID int64, limit, offset int) ([]Lead, error) {
|
||||
rows, err := db.Query(
|
||||
`SELECT lead_id, client_id, name, phone_raw, phone_normalized, service_interest, status, needs_review,
|
||||
COALESCE(appointment_date,''), COALESCE(appointment_time,''), payment_status,
|
||||
COALESCE(payment_amount,0), COALESCE(payment_date,''), created_at, last_contact_at
|
||||
FROM leads WHERE client_id = ? AND needs_review = 1
|
||||
ORDER BY created_at DESC LIMIT ? OFFSET ?`,
|
||||
clientID, limit, offset,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
return scanLeads(rows)
|
||||
}
|
||||
|
||||
func ListAllLeads(db *sql.DB, clientID int64, limit, offset int) ([]Lead, error) {
|
||||
rows, err := db.Query(
|
||||
`SELECT lead_id, client_id, name, phone_raw, phone_normalized, service_interest, status, needs_review,
|
||||
COALESCE(appointment_date,''), COALESCE(appointment_time,''), payment_status,
|
||||
COALESCE(payment_amount,0), COALESCE(payment_date,''), created_at, last_contact_at
|
||||
FROM leads WHERE client_id = ?
|
||||
ORDER BY created_at DESC LIMIT ? OFFSET ?`,
|
||||
clientID, limit, offset,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
return scanLeads(rows)
|
||||
}
|
||||
|
||||
func CountLeadsNeedingReview(db *sql.DB, clientID int64) (int, error) {
|
||||
var n int
|
||||
err := db.QueryRow(
|
||||
"SELECT COUNT(*) FROM leads WHERE client_id = ? AND needs_review = 1",
|
||||
clientID,
|
||||
).Scan(&n)
|
||||
return n, err
|
||||
}
|
||||
|
||||
func scanLeads(rows *sql.Rows) ([]Lead, error) {
|
||||
var leads []Lead
|
||||
for rows.Next() {
|
||||
var l Lead
|
||||
var needsReview int
|
||||
if err := rows.Scan(
|
||||
&l.LeadID, &l.ClientID, &l.Name, &l.PhoneRaw, &l.PhoneNormalized,
|
||||
&l.ServiceInterest, &l.Status, &needsReview,
|
||||
&l.AppointmentDate, &l.AppointmentTime, &l.PaymentStatus,
|
||||
&l.PaymentAmount, &l.PaymentDate, &l.CreatedAt, &l.LastContactAt,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
l.NeedsReview = needsReview == 1
|
||||
leads = append(leads, l)
|
||||
}
|
||||
return leads, rows.Err()
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// ServiceKeyword
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
type ServiceKeyword struct {
|
||||
KeywordID int64 `json:"keyword_id"`
|
||||
ClientID int64 `json:"client_id"`
|
||||
ServiceName string `json:"service_name"`
|
||||
Keyword string `json:"keyword"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
}
|
||||
|
||||
func ListServiceKeywords(db *sql.DB, clientID int64) ([]ServiceKeyword, error) {
|
||||
rows, err := db.Query(
|
||||
"SELECT keyword_id, client_id, service_name, keyword, created_at FROM service_keywords WHERE client_id = ? ORDER BY service_name, keyword",
|
||||
clientID,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var kws []ServiceKeyword
|
||||
for rows.Next() {
|
||||
var kw ServiceKeyword
|
||||
if err := rows.Scan(&kw.KeywordID, &kw.ClientID, &kw.ServiceName, &kw.Keyword, &kw.CreatedAt); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
kws = append(kws, kw)
|
||||
}
|
||||
return kws, rows.Err()
|
||||
}
|
||||
|
||||
func LoadKeywordMapping(db *sql.DB, clientID int64) (map[string]string, error) {
|
||||
kws, err := ListServiceKeywords(db, clientID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
m := make(map[string]string, len(kws))
|
||||
for _, kw := range kws {
|
||||
m[kw.Keyword] = kw.ServiceName
|
||||
}
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func AddServiceKeyword(db *sql.DB, clientID int64, serviceName, keyword string) error {
|
||||
_, err := db.Exec(
|
||||
"INSERT INTO service_keywords (client_id, service_name, keyword, created_at) VALUES (?, ?, ?, ?)",
|
||||
clientID, serviceName, keyword, time.Now().Unix(),
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
func DeleteServiceKeyword(db *sql.DB, clientID, keywordID int64) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM service_keywords WHERE keyword_id = ? AND client_id = ?",
|
||||
keywordID, clientID,
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// LeadStatus
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
type LeadStatus struct {
|
||||
StatusID int64 `json:"status_id"`
|
||||
ClientID int64 `json:"client_id"`
|
||||
StatusName string `json:"status_name"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
}
|
||||
|
||||
func ListLeadStatuses(db *sql.DB, clientID int64) ([]LeadStatus, error) {
|
||||
rows, err := db.Query(
|
||||
"SELECT status_id, client_id, status_name, created_at FROM lead_statuses WHERE client_id = ? ORDER BY created_at",
|
||||
clientID,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var statuses []LeadStatus
|
||||
for rows.Next() {
|
||||
var s LeadStatus
|
||||
if err := rows.Scan(&s.StatusID, &s.ClientID, &s.StatusName, &s.CreatedAt); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
statuses = append(statuses, s)
|
||||
}
|
||||
return statuses, rows.Err()
|
||||
}
|
||||
|
||||
func AddLeadStatus(db *sql.DB, clientID int64, statusName string) error {
|
||||
_, err := db.Exec(
|
||||
"INSERT INTO lead_statuses (client_id, status_name, created_at) VALUES (?, ?, ?)",
|
||||
clientID, statusName, time.Now().Unix(),
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
func DeleteLeadStatus(db *sql.DB, clientID, statusID int64) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM lead_statuses WHERE status_id = ? AND client_id = ?",
|
||||
statusID, clientID,
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
type Question struct {
|
||||
QuestionID int64 `json:"question_id"`
|
||||
ClientID int64 `json:"client_id"`
|
||||
@@ -497,4 +777,28 @@ func ListAnswersWithDetails(db *sql.DB, accountID, questionID int64, limit, offs
|
||||
answers = append(answers, a)
|
||||
}
|
||||
return answers, rows.Err()
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Processed Messages (dedup)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
func IsMessageProcessed(db *sql.DB, clientID int64, messageID string) (bool, error) {
|
||||
var count int
|
||||
err := db.QueryRow(
|
||||
`SELECT COUNT(*) FROM processed_messages WHERE client_id = ? AND message_id = ?`,
|
||||
clientID, messageID,
|
||||
).Scan(&count)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
return count > 0, nil
|
||||
}
|
||||
|
||||
func RecordProcessedMessage(db *sql.DB, clientID int64, messageID string) error {
|
||||
_, err := db.Exec(
|
||||
`INSERT OR IGNORE INTO processed_messages (message_id, client_id) VALUES (?, ?)`,
|
||||
messageID, clientID,
|
||||
)
|
||||
return err
|
||||
}
|
||||
Reference in New Issue
Block a user