diff --git a/svc/routes/login.go b/svc/routes/login.go index 0da448b..7d8cc16 100644 --- a/svc/routes/login.go +++ b/svc/routes/login.go @@ -36,7 +36,6 @@ func ensureLegacyUserReadyForSession(db *sql.DB, legacyUser *models.User) (int64 _, err := db.Exec(` INSERT INTO mk_dfusr ( id, - code, username, email, full_name, @@ -46,15 +45,13 @@ func ensureLegacyUserReadyForSession(db *sql.DB, legacyUser *models.User) (int64 password_hash, force_password_change, created_at, - updated_at, - last_updated_date + updated_at ) 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) DO UPDATE SET - code = EXCLUDED.code, username = EXCLUDED.username, email = EXCLUDED.email, 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), is_active = EXCLUDED.is_active, force_password_change = true, - updated_at = NOW(), - last_updated_date = NOW() + updated_at = NOW() `, desiredID, strings.TrimSpace(legacyUser.Username), - strings.TrimSpace(legacyUser.Username), strings.TrimSpace(legacyUser.Email), strings.TrimSpace(legacyUser.FullName), strings.TrimSpace(legacyUser.Mobile), @@ -89,8 +84,7 @@ func ensureLegacyUserReadyForSession(db *sql.DB, legacyUser *models.User) (int64 SET is_active = $1, force_password_change = true, - updated_at = NOW(), - last_updated_date = NOW() + updated_at = NOW() WHERE id = $2 `, legacyUser.IsActive, existing.ID) if updErr != nil {