Doormile/doormile_backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates on the onboardings and hubs patches as well

Browse Source
This commit is contained in:
dharaneesh-r
2026-10-06 19:11:18 +05:30
parent 7ff9dad288
commit 0326624ca3
6 changed files with 559 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
controllers/clientOnboardingController.go
View File

@@ -48,6 +48,55 @@ type onboardClientRequest struct {
Password string `json:"password"`
Applocationid int `json:"applocationid"`
Requiredeliveryotp bool `json:"requiredeliveryotp"`
// The client's main address (flat in the JSON). Saved as their primary
// tenantlocations row, which is what a client login's zone list and the
// order form's pickup "Business Hub" read. A client onboarded without one
// had an empty zone list and no pickup point to start from.
clientAddress
}
// clientAddress is one client location as the onboarding form sends it, after
// the operator picked it from the address search (which supplies the map
// coordinates).
type clientAddress struct {
Address string `json:"address"`
City string `json:"city"`
State string `json:"state"`
Pincode string `json:"pincode"`
Latitude float64 `json:"latitude"`
Longitude float64 `json:"longitude"`
}
var indianPincode = regexp.MustCompile(`^[1-9]\d{5}$`)
// validate normalises the address in place and returns an operator-readable
// message for the first problem, or "". Kept apart from the request's own
// validate because an edit may leave the address alone.
func (a *clientAddress) validate() string {
a.Address = strings.Join(strings.Fields(a.Address), " ")
a.City = strings.Join(strings.Fields(a.City), " ")
a.State = strings.Join(strings.Fields(a.State), " ")
a.Pincode = strings.ReplaceAll(strings.TrimSpace(a.Pincode), " ", "")
switch n := utf8.RuneCountInString(a.Address); {
case n < 5:
return "enter the client's address"
case n > 300:
return "address is too long (at most 300 characters)"
}
if !indianPincode.MatchString(a.Pincode) {
return "enter a valid 6-digit pincode"
}
if utf8.RuneCountInString(a.City) > 80 || utf8.RuneCountInString(a.State) > 80 {
return "city or state is too long (at most 80 characters)"
}
// Roughly India's bounding box. Zero (no pick) and swapped lat/lon both
// land outside it, and a location without real coordinates would match no
// zone and give the rider nowhere to go.
if a.Latitude < 6 || a.Latitude > 37.5 || a.Longitude < 68 || a.Longitude > 97.5 {
return "pick the address from the suggestions so it has a map location"
}
return ""
}
// normalisePhone strips spaces, dashes and a +91/91/0 prefix.
@@ -136,6 +185,9 @@ func OnboardClient(c *fiber.Ctx) error {
if msg := req.validate(); msg != "" {
return utils.BadRequest(c, msg)
}
if msg := req.clientAddress.validate(); msg != "" {
return utils.BadRequest(c, msg)
}
hash, err := utils.HashPassword(req.Password)
if err != nil {
@@ -145,6 +197,7 @@ func OnboardClient(c *fiber.Ctx) error {
var tenant models.Tenant
var user models.AppUser
var auth models.DoormileAuth
var location models.TenantLocation
err = db.DB.Transaction(func(tx *gorm.DB) error {
var city models.AppLocation
@@ -178,6 +231,29 @@ func OnboardClient(c *fiber.Ctx) error {
}
tenantID := tenant.Tenantid
// The client's main address, as their primary location, in the same
// transaction: a client is never created without it.
cityName := req.City
if cityName == "" {
cityName = city.Applocationname
}
location = models.TenantLocation{
Tenantid: tenantID,
Locationname: req.Companyname,
Address: req.Address,
City: cityName,
State: req.State,
Pincode: req.Pincode,
Latitude: req.Latitude,
Longitude: req.Longitude,
Isprimary: true,
Status: "Active",
}
if err := tx.Create(&location).Error; err != nil {
return err
}
auth = models.DoormileAuth{Email: req.Email, PasswordHash: hash, Role: clientLoginRole, Tenantid: &tenantID}
if err := tx.Create(&auth).Error; err != nil {
return err
@@ -222,6 +298,13 @@ func OnboardClient(c *fiber.Ctx) error {
"status": tenant.Status,
"requiredeliveryotp": tenant.Requiredeliveryotp,
},
"location": fiber.Map{
"tenantlocationid": location.Tenantlocationid,
"address": location.Address,
"city": location.City,
"state": location.State,
"pincode": location.Pincode,
},
"login": fiber.Map{
"email": auth.Email,
"role": auth.Role,
@@ -244,6 +327,14 @@ type onboardedClient struct {
Loginemail string `json:"loginemail"`
Loginrole string `json:"loginrole"`
Logincreatedat *time.Time `json:"logincreatedat"`
// The client's main address (primary location); empty for a client
// onboarded before addresses were collected.
Address string `json:"address"`
City string `json:"city"`
State string `json:"state"`
Pincode string `json:"pincode"`
Latitude float64 `json:"latitude"`
Longitude float64 `json:"longitude"`
}
// realTime drops the zero/placeholder timestamps some older logins carry (they
@@ -266,9 +357,15 @@ func GetOnboardedClients(c *fiber.Ctx) error {
Select(`a.id AS authid, t.tenantid, t.tenantname, t.primaryemail, t.primarycontact, t.status,
t.requiredeliveryotp, COALESCE(u.authname, '') AS contactname,
a.email AS loginemail, a.role AS loginrole,
a.created_at AS authcreatedat, t.createdat AS tenantcreatedat`).
a.created_at AS authcreatedat, t.createdat AS tenantcreatedat,
COALESCE(l.address, '') AS address, COALESCE(l.city, '') AS city, COALESCE(l.state, '') AS state,
COALESCE(l.pincode, '') AS pincode, COALESCE(l.latitude, 0) AS latitude, COALESCE(l.longitude, 0) AS longitude`).
Joins("JOIN tenants t ON t.tenantid = a.tenantid").
Joins("LEFT JOIN appusers u ON LOWER(u.email) = LOWER(a.email) AND u.tenantid = a.tenantid").
Joins(`LEFT JOIN LATERAL (
SELECT address, city, state, pincode, latitude, longitude FROM tenantlocations
WHERE tenantid = t.tenantid AND (status IS NULL OR status = '' OR LOWER(status) = 'active')
ORDER BY isprimary DESC, tenantlocationid LIMIT 1) l ON TRUE`).
Where("a.tenantid IS NOT NULL").
Order("a.id DESC").
Limit(200).
@@ -301,6 +398,12 @@ type onboardedClientRow struct {
Loginrole string `gorm:"column:loginrole"`
Authcreatedat *time.Time `gorm:"column:authcreatedat"`
Tenantcreatedat *time.Time `gorm:"column:tenantcreatedat"`
Address string `gorm:"column:address"`
City string `gorm:"column:city"`
State string `gorm:"column:state"`
Pincode string `gorm:"column:pincode"`
Latitude float64 `gorm:"column:latitude"`
Longitude float64 `gorm:"column:longitude"`
}
func (r onboardedClientRow) toClient() onboardedClient {
@@ -318,6 +421,8 @@ func (r onboardedClientRow) toClient() onboardedClient {
Primaryemail: r.Primaryemail, Primarycontact: r.Primarycontact, Status: r.Status,
Requiredeliveryotp: r.Requiredeliveryotp, Contactname: r.Contactname,
Loginemail: r.Loginemail, Loginrole: r.Loginrole, Logincreatedat: created,
Address: r.Address, City: r.City, State: r.State, Pincode: r.Pincode,
Latitude: r.Latitude, Longitude: r.Longitude,
}
}
@@ -339,6 +444,9 @@ type updateClientRequest struct {
Status *string `json:"status"`
Requiredeliveryotp *bool `json:"requiredeliveryotp"`
Password *string `json:"password"` // optional reset; empty = unchanged
// Location replaces the client's main address (primary location), or
// creates it for a client onboarded before addresses were collected.
Location *clientAddress `json:"location"`
}
var clientStatuses = map[string]string{"active": "Active", "pending": "Pending", "inactive": "Inactive"}
@@ -395,6 +503,11 @@ func UpdateOnboardedClient(c *fiber.Ctx) error {
if msg := check.validate(); msg != "" {
return utils.BadRequest(c, msg)
}
if req.Location != nil {
if msg := req.Location.validate(); msg != "" {
return utils.BadRequest(c, msg)
}
}
status := tenant.Status
if req.Status != nil {
s, ok := clientStatuses[strings.ToLower(strings.TrimSpace(*req.Status))]
@@ -481,6 +594,13 @@ func UpdateOnboardedClient(c *fiber.Ctx) error {
return err
}
}
if req.Location != nil {
name := tenant.Tenantname
if req.Companyname != nil {
name = check.Companyname
}
return saveMainAddress(tx, tenant.Tenantid, name, *req.Location)
}
return nil
})
@@ -496,10 +616,40 @@ func UpdateOnboardedClient(c *fiber.Ctx) error {
}
utils.Info("client updated", "by", actor.Email, "tenantid", tenant.Tenantid, "authid", auth.ID,
"password_reset", hash != "", "email_changed", req.Email != nil && check.Email != strings.ToLower(oldEmail))
"password_reset", hash != "", "email_changed", req.Email != nil && check.Email != strings.ToLower(oldEmail),
"address_changed", req.Location != nil)
return utils.OK(c, fiber.Map{"authid": auth.ID, "tenantid": tenant.Tenantid, "status": status, "password_reset": hash != ""})
}
// saveMainAddress updates the client's main address (the primary location,
// else its first active one) or, when it has none, creates it as primary.
// City falls back to the existing one when the form sent none.
func saveMainAddress(tx *gorm.DB, tenantID int, name string, a clientAddress) error {
var loc models.TenantLocation
err := tx.Where("tenantid = ? AND (status IS NULL OR status = '' OR LOWER(status) = 'active')", tenantID).
Order("isprimary DESC, tenantlocationid").First(&loc).Error
if errors.Is(err, gorm.ErrRecordNotFound) {
return tx.Create(&models.TenantLocation{
Tenantid: tenantID, Locationname: name, Address: a.Address, City: a.City, State: a.State,
Pincode: a.Pincode, Latitude: a.Latitude, Longitude: a.Longitude, Isprimary: true, Status: "Active",
}).Error
}
if err != nil {
return err
}
updates := map[string]any{
"address": a.Address, "pincode": a.Pincode, "latitude": a.Latitude, "longitude": a.Longitude,
"isprimary": true, "updatedat": gorm.Expr("CURRENT_TIMESTAMP"),
}
if a.City != "" {
updates["city"] = a.City
}
if a.State != "" {
updates["state"] = a.State
}
return tx.Model(&models.TenantLocation{}).Where("tenantlocationid = ?", loc.Tenantlocationid).Updates(updates).Error
}
// DeleteOnboardedClient — DELETE /admin/clients/:id (id = the login's authid).
//
// Removes the CONSOLE LOGIN, not the company's history: the doormile_auth row