M_Kececi/bssapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
M_Kececi
2026-02-18 16:40:55 +03:00
parent 1263531edd
commit 744e20591d
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
svc/routes/login.go
View File

@@ -36,7 +36,6 @@ func ensureLegacyUserReadyForSession(db *sql.DB, legacyUser *models.User) (int64
_, err := db.Exec(` _, err := db.Exec(`
INSERT INTO mk_dfusr ( INSERT INTO mk_dfusr (
id, id,
code,
username, username,
email, email,
full_name, full_name,
@@ -46,15 +45,13 @@ func ensureLegacyUserReadyForSession(db *sql.DB, legacyUser *models.User) (int64
password_hash, password_hash,
force_password_change, force_password_change,
created_at, created_at,
updated_at, updated_at
last_updated_date
) )
VALUES ( VALUES (
$1,$2,$3,$4,$5,$6,$7,$8,'',true,NOW(),NOW(),NOW() $1,$2,$3,$4,$5,$6,$7,'',true,NOW(),NOW()
) )
ON CONFLICT (id) ON CONFLICT (id)
DO UPDATE SET DO UPDATE SET
code = EXCLUDED.code,
username = EXCLUDED.username, username = EXCLUDED.username,
email = EXCLUDED.email, email = EXCLUDED.email,
full_name = COALESCE(NULLIF(EXCLUDED.full_name, ''), mk_dfusr.full_name), full_name = COALESCE(NULLIF(EXCLUDED.full_name, ''), mk_dfusr.full_name),
@@ -62,12 +59,10 @@ func ensureLegacyUserReadyForSession(db *sql.DB, legacyUser *models.User) (int64
address = COALESCE(NULLIF(EXCLUDED.address, ''), mk_dfusr.address), address = COALESCE(NULLIF(EXCLUDED.address, ''), mk_dfusr.address),
is_active = EXCLUDED.is_active, is_active = EXCLUDED.is_active,
force_password_change = true, force_password_change = true,
updated_at = NOW(), updated_at = NOW()
last_updated_date = NOW()
`, `,
desiredID, desiredID,
strings.TrimSpace(legacyUser.Username), strings.TrimSpace(legacyUser.Username),
strings.TrimSpace(legacyUser.Username),
strings.TrimSpace(legacyUser.Email), strings.TrimSpace(legacyUser.Email),
strings.TrimSpace(legacyUser.FullName), strings.TrimSpace(legacyUser.FullName),
strings.TrimSpace(legacyUser.Mobile), strings.TrimSpace(legacyUser.Mobile),
@@ -89,8 +84,7 @@ func ensureLegacyUserReadyForSession(db *sql.DB, legacyUser *models.User) (int64
SET SET
is_active = $1, is_active = $1,
force_password_change = true, force_password_change = true,
updated_at = NOW(), updated_at = NOW()
last_updated_date = NOW()
WHERE id = $2 WHERE id = $2
`, legacyUser.IsActive, existing.ID) `, legacyUser.IsActive, existing.ID)
if updErr != nil { if updErr != nil {