make default_group as utility and added more things

Signed-off-by: Kenneth Obsequio <k80308392@gmail.com>
This commit is contained in:
2026-07-15 21:34:21 +08:00
parent 1745990cda
commit 04baad0cac
7 changed files with 247 additions and 13 deletions
+6 -13
View File
@@ -39,6 +39,7 @@ const mdl_Users = require('../models/users/users.mdl');
const mdl_UserSessions = require('../models/users/user_sessions.mdl');
const { checkAccountStatus } = require('../services/accountStatus.service');
const { mdl_UserGroups, mdl_UserGroupMembers } = require('../models/users/user_groups.mdl')
const { NOGRP_CODE, getDefaultGroupId, enrollDefaultGroup } = require('../utils/defaultGroup.util');
const { generateTokens, verifyRefreshToken, hashToken, shouldRotateRefreshToken } = require('../utils/token.util');
const { generateState, generateNonce, generatePKCE, buildAuthUrl, exchangeCode, verifyIdToken } = require('../utils/google_oidc.util');
const { generateOTP, getOTPExpiry, isOTPExpired } = require('../utils/otp.util');
@@ -135,8 +136,7 @@ exports.register = async (req, res) => {
}
// ── Resolve enroll target (explicit group or NOGRP fallback) ──────────────
const enrollGroup = group
?? await mdl_UserGroups.findOne({ where: { group_code: 'NOGRP', is_active: true } });
const enrollGroupId = group?.group_id ?? await getDefaultGroupId();
// ── Create user ───────────────────────────────────────────────────────────
const hashed = await bcrypt.hash(password, 12);
@@ -160,9 +160,9 @@ exports.register = async (req, res) => {
}, { transaction });
// ── Enroll into group ─────────────────────────────────────────────────────
if (enrollGroup) {
if (enrollGroupId) {
await mdl_UserGroupMembers.create({
group_id: enrollGroup.group_id,
group_id: enrollGroupId,
user_id: user.user_id,
createdBy: null,
}, { transaction });
@@ -255,7 +255,7 @@ exports.verifyOTP = async (req, res) => {
updatedAt: now,
},
];
if (grp?.group_code === 'NOGRP') {
if (grp?.group_code === NOGRP_CODE) {
notifications.push({
user_id: user.user_id,
...NOTIFICATION_REGISTRY.nogrp_welcome.build(),
@@ -465,14 +465,7 @@ exports.googleCallback = async (req, res) => {
},
}, { transaction: t });
const noGrp = await mdl_UserGroups.findOne({ where: { group_code: 'NOGRP', is_active: true }, transaction: t });
if (noGrp) {
await mdl_UserGroupMembers.create({
group_id: noGrp.group_id,
user_id: user.user_id,
createdBy: null,
}, { transaction: t });
}
await enrollDefaultGroup(user.user_id, { transaction: t });
await t.commit();