This commit is contained in:
shafi54 2026-11-22 12:06:54 +05:30
parent 085f87842f
commit 78611f719b
8 changed files with 61 additions and 28 deletions

View file

@ -121,7 +121,6 @@ export {
getLastOrdersByUserIds, getLastOrdersByUserIds,
getSuspensionStatusesByUserIds, getSuspensionStatusesByUserIds,
getUserBasicInfo, getUserBasicInfo,
getUserSuspensionStatus,
getUserOrders, getUserOrders,
getOrderStatusesByOrderIds, getOrderStatusesByOrderIds,
getItemCountsByOrderIds, getItemCountsByOrderIds,
@ -194,7 +193,6 @@ export {
applyDiscountToUserOrder, applyDiscountToUserOrder,
getUserAddressByIdAndUser, getUserAddressByIdAndUser,
getOrderProductById, getOrderProductById,
checkUserSuspended,
getUserSlotCapacityStatus, getUserSlotCapacityStatus,
placeUserOrderTransaction, placeUserOrderTransaction,
deleteUserCartItemsForOrder, deleteUserCartItemsForOrder,

View file

@ -9,7 +9,7 @@ import {
getLastOrdersByUserIds, getLastOrdersByUserIds,
getSuspensionStatusesByUserIds, getSuspensionStatusesByUserIds,
getUserBasicInfo, getUserBasicInfo,
getUserSuspensionStatus, isUserSuspended,
getUserOrders, getUserOrders,
getOrderStatusesByOrderIds, getOrderStatusesByOrderIds,
getItemCountsByOrderIds, getItemCountsByOrderIds,
@ -97,7 +97,7 @@ export const userRouter = {
// Suspension status and the order list are independent reads. // Suspension status and the order list are independent reads.
const [isSuspended, userOrders] = await Promise.all([ const [isSuspended, userOrders] = await Promise.all([
getUserSuspensionStatus(userId), isUserSuspended(userId),
getUserOrders(ctx.staffUser!.regionId, userId), getUserOrders(ctx.staffUser!.regionId, userId),
]); ]);

View file

@ -2,7 +2,6 @@ import { router, protectedProcedure } from "@/src/trpc/trpc-index";
import { z } from "zod"; import { z } from "zod";
import { import {
cancelUserOrderTransaction, cancelUserOrderTransaction,
checkUserSuspended,
composeUnitNotation, composeUnitNotation,
db, db,
deleteUserCartItemsForOrder, deleteUserCartItemsForOrder,
@ -19,6 +18,7 @@ import {
getEffectiveRegionSettings, getEffectiveRegionSettings,
getEffectiveBoundId, getEffectiveBoundId,
getRegionSettingsForBound, getRegionSettingsForBound,
isUserSuspended,
orders, orders,
orderItems, orderItems,
orderStatus, orderStatus,
@ -387,7 +387,7 @@ export const orderRouter = router({
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
const userId = ctx.user.userId; const userId = ctx.user.userId;
const isSuspended = await checkUserSuspended(userId); const isSuspended = await isUserSuspended(userId);
if (isSuspended) { if (isSuspended) {
throw new ApiError("Unable to place order", 403); throw new ApiError("Unable to place order", 403);
} }

View file

@ -2011,3 +2011,54 @@ pair (maxSdkVersion=32) stays so picking still works on Android <= 12.
... ...
Native change: needs a rebuild; cannot ship over OTA. Native change: needs a rebuild; cannot ship over OTA.
[2026-11-22 12:05:04 IST] suspension: collapse the three copies of the "is this user suspended?" check into one. (re-applied on 1.3.0_i1)
`user-apis/auth.ts` already had `isUserSuspended` (select + `?? false`). Two more
copies existed with the same query and the same fallback:
- user-apis/order.ts `checkUserSuspended` (db.query.findFirst)
- admin-apis/user.ts `getUserSuspensionStatus` (select + limit 1)
`isUserSuspended` in user-apis/auth.ts is now the only implementation; both
callers (user order place, admin user details) import it. Removed both aliases
from the package barrel and from `apps/backend/src/sqliteImporter.ts`.
No behavior change: all three were `user_details.is_suspended ?? false`.
`user_details` is optional/lazy, so a missing row still means "not suspended".
--- packages/db_helper_sqlite/src/user-apis/auth.ts
+/** Single source of truth for the account suspension flag. ... */
export async function isUserSuspended(userId: number): Promise<boolean> {
--- packages/db_helper_sqlite/src/user-apis/order.ts
-import { ..., userDetails, ... } from '../db/schema'
-export async function checkUserSuspended(userId: number): Promise<boolean> {
- const userDetail = await db.query.userDetails.findFirst({
- where: eq(userDetails.userId, userId),
- })
- return userDetail?.isSuspended ?? false
-}
--- packages/db_helper_sqlite/src/admin-apis/user.ts
-export async function getUserSuspensionStatus(userId: number): Promise<boolean> {
- ... select is_suspended where user_id = userId limit 1 ...
-}
--- packages/db_helper_sqlite/index.ts
- getUserSuspensionStatus,
- checkUserSuspended,
--- apps/backend/src/sqliteImporter.ts
- getUserSuspensionStatus,
- checkUserSuspended,
--- apps/backend/src/trpc/apis/user-apis/apis/order.ts
- checkUserSuspended,
+ isUserSuspended,
- const isSuspended = await checkUserSuspended(userId);
+ const isSuspended = await isUserSuspended(userId);
--- apps/backend/src/trpc/apis/admin-apis/apis/user.ts
- getUserSuspensionStatus,
+ isUserSuspended,
- getUserSuspensionStatus(userId),
+ isUserSuspended(userId),

View file

@ -151,7 +151,6 @@ export {
getLastOrdersByUserIds, getLastOrdersByUserIds,
getSuspensionStatusesByUserIds, getSuspensionStatusesByUserIds,
getUserBasicInfo, getUserBasicInfo,
getUserSuspensionStatus,
getUserOrders, getUserOrders,
getOrderStatusesByOrderIds, getOrderStatusesByOrderIds,
getItemCountsByOrderIds, getItemCountsByOrderIds,
@ -267,7 +266,6 @@ export {
applyDiscountToOrder as applyDiscountToUserOrder, applyDiscountToOrder as applyDiscountToUserOrder,
getAddressByIdAndUser as getUserAddressByIdAndUser, getAddressByIdAndUser as getUserAddressByIdAndUser,
getProductById as getOrderProductById, getProductById as getOrderProductById,
checkUserSuspended,
getSlotCapacityStatus as getUserSlotCapacityStatus, getSlotCapacityStatus as getUserSlotCapacityStatus,
placeOrderTransaction as placeUserOrderTransaction, placeOrderTransaction as placeUserOrderTransaction,
deleteCartItemsForOrder as deleteUserCartItemsForOrder, deleteCartItemsForOrder as deleteUserCartItemsForOrder,

View file

@ -123,18 +123,6 @@ export async function getUserBasicInfo(regionId: number, userId: number): Promis
return user[0] || null return user[0] || null
} }
export async function getUserSuspensionStatus(userId: number): Promise<boolean> {
const userDetail = await db
.select({
isSuspended: userDetails.isSuspended,
})
.from(userDetails)
.where(eq(userDetails.userId, userId))
.limit(1)
return userDetail[0]?.isSuspended ?? false
}
export async function getUserOrders(regionId: number, userId: number): Promise<any[]> { export async function getUserOrders(regionId: number, userId: number): Promise<any[]> {
return await db return await db
.select({ .select({

View file

@ -43,6 +43,12 @@ export async function getUserDetails(userId: number) {
return details || null return details || null
} }
/**
* Single source of truth for the account suspension flag.
*
* `user_details` is an optional, lazily-created profile row (most accounts never
* get one), so a missing row means "not suspended".
*/
export async function isUserSuspended(userId: number): Promise<boolean> { export async function isUserSuspended(userId: number): Promise<boolean> {
const details = await getUserDetails(userId) const details = await getUserDetails(userId)
return details?.isSuspended ?? false return details?.isSuspended ?? false

View file

@ -10,7 +10,6 @@ import {
couponUsage, couponUsage,
cartItems, cartItems,
units, units,
userDetails,
deliverySlotInfo, deliverySlotInfo,
} from '../db/schema' } from '../db/schema'
import { and, eq, inArray, desc, sql } from 'drizzle-orm' import { and, eq, inArray, desc, sql } from 'drizzle-orm'
@ -308,13 +307,6 @@ export async function getProductById(skuId: number, regionId?: number | null) {
} }
} }
export async function checkUserSuspended(userId: number): Promise<boolean> {
const userDetail = await db.query.userDetails.findFirst({
where: eq(userDetails.userId, userId),
})
return userDetail?.isSuspended ?? false
}
export async function getSlotCapacityStatus(slotId: number): Promise<boolean> { export async function getSlotCapacityStatus(slotId: number): Promise<boolean> {
const slot = await db.query.deliverySlotInfo.findFirst({ const slot = await db.query.deliverySlotInfo.findFirst({
where: eq(deliverySlotInfo.id, slotId), where: eq(deliverySlotInfo.id, slotId),