feat: add filters for user data limits and expiration dates

- Extend `get_users` function to include parameters for data limit range (min and max), and expiration date range (expire after and expire before).
- Implement logic to filter users based on the new parameters in the database query.
- Update the user operation and router to handle the new filters.
- Enhance the advance search modal to allow users to input data limit and expiration date filters.
- Add corresponding translations for the new filters in multiple languages.
- Update the API to parse and handle the new filter parameters.
- Implement tests to verify the functionality of the new filters for data limits and expiration dates.

Author: ImMohammad20000

app/db/crud/user.py

@@ -286,6 +286,12 @@ async def get_users(
     admin: Admin | None = None,
     admins: list[str] | None = None,
     reset_strategy: DataLimitResetStrategy | list[DataLimitResetStrategy] | None = None,
+    data_limit_min: int | None = None,
+    data_limit_max: int | None = None,
+    expire_after: datetime | None = None,
+    expire_before: datetime | None = None,
+    no_data_limit: bool = False,
+    no_expire: bool = False,
     return_with_count: bool = False,
     group_ids: list[int] | None = None,
 ) -> list[User] | tuple[list[User], int]:
@@ -303,6 +309,12 @@ async def get_users(
         admin: Admin filter.
         admins: List of admin usernames to filter by.
         reset_strategy: Reset strategy filter (single strategy or list).
+        data_limit_min: Minimum user data limit in bytes.
+        data_limit_max: Maximum user data limit in bytes.
+        expire_after: Include users whose expire date is on or after this datetime.
+        expire_before: Include users whose expire date is on or before this datetime.
+        no_data_limit: Include only users with no data limit set.
+        no_expire: Include only users with no expire date set.
         return_with_count: Whether to return total count.
         group_ids: Filter users by their group IDs.
 
@@ -336,6 +348,20 @@ async def get_users(
             filters.append(User.data_limit_reset_strategy.in_(reset_strategy))
         else:
             filters.append(User.data_limit_reset_strategy == reset_strategy)
+    if no_data_limit:
+        filters.append(or_(User.data_limit.is_(None), User.data_limit == 0))
+    else:
+        if data_limit_min is not None:
+            filters.append(and_(User.data_limit.is_not(None), User.data_limit >= data_limit_min))
+        if data_limit_max is not None:
+            filters.append(and_(User.data_limit.is_not(None), User.data_limit <= data_limit_max))
+    if no_expire:
+        filters.append(User.expire.is_(None))
+    else:
+        if expire_after is not None:
+            filters.append(and_(User.expire.is_not(None), User.expire >= expire_after))
+        if expire_before is not None:
+            filters.append(and_(User.expire.is_not(None), User.expire <= expire_before))
 
     if group_ids:
         filters.append(User.groups.any(Group.id.in_(group_ids)))

app/operation/user.py

@@ -723,6 +723,12 @@ async def get_users(
         status: UserStatus | None = None,
         sort: str | None = None,
         proxy_id: str | None = None,
+        data_limit_min: int | None = None,
+        data_limit_max: int | None = None,
+        expire_after: dt | None = None,
+        expire_before: dt | None = None,
+        no_data_limit: bool = False,
+        no_expire: bool = False,
         load_sub: bool = False,
         group_ids: list[int] | None = None,
     ) -> UsersResponse:
@@ -750,6 +756,12 @@ async def get_users(
             status=status,
             sort=sort_list,
             proxy_id=proxy_id,
+            data_limit_min=data_limit_min,
+            data_limit_max=data_limit_max,
+            expire_after=expire_after,
+            expire_before=expire_before,
+            no_data_limit=no_data_limit,
+            no_expire=no_expire,
             admins=owner if admin.is_sudo else [admin.username],
             return_with_count=True,
             group_ids=group_ids,

app/routers/user.py

@@ -418,6 +418,12 @@ async def get_users(
     status: UserStatus | None = None,
     sort: str | None = None,
     proxy_id: str | None = None,
+    data_limit_min: int | None = Query(None, ge=0),
+    data_limit_max: int | None = Query(None, ge=0),
+    expire_after: dt | None = Query(None, examples=["2026-01-01T00:00:00+03:30"]),
+    expire_before: dt | None = Query(None, examples=["2026-01-31T23:59:59+03:30"]),
+    no_data_limit: bool = False,
+    no_expire: bool = False,
     load_sub: bool = False,
     db: AsyncSession = Depends(get_db),
     admin: AdminDetails = Depends(get_current),
@@ -435,6 +441,12 @@ async def get_users(
         sort=sort,
         load_sub=load_sub,
         proxy_id=proxy_id,
+        data_limit_min=data_limit_min,
+        data_limit_max=data_limit_max,
+        expire_after=expire_after,
+        expire_before=expire_before,
+        no_data_limit=no_data_limit,
+        no_expire=no_expire,
         group_ids=group_ids,
     )
 

dashboard/public/statics/locales/en.json

@@ -2246,6 +2246,19 @@
     "showSelectionCheckboxDescription": "Shows row checkboxes for bulk selection.",
     "byStatus": "Status",
     "statusDescription": "Leave on All to include every status.",
+    "dataLimitDescription": "Filter users by data-limit range in gigabytes.",
+    "dataLimitMin": "Minimum data limit (GB)",
+    "dataLimitMax": "Maximum data limit (GB)",
+    "dataLimitMinPlaceholder": "e.g. 10",
+    "dataLimitMaxPlaceholder": "e.g. 100",
+    "noDataLimit": "Only users with no data limit",
+    "noDataLimitDescription": "Shows users whose data limit is unlimited.",
+    "expireAfter": "Expire after",
+    "expireBefore": "Expire before",
+    "expireAfterPlaceholder": "Select start date",
+    "expireBeforePlaceholder": "Select end date",
+    "noExpire": "Only users with no expire date",
+    "noExpireDescription": "Shows users whose account has no expire date.",
     "byAdmin": "Admin",
     "byGroup": "Group",
     "displaySection": "Table display",

dashboard/public/statics/locales/fa.json

@@ -2220,6 +2220,19 @@
     "showSelectionCheckboxDescription": "چک‌باکس سطرها را برای انتخاب گروهی نمایش می‌دهد.",
     "byStatus": "وضعیت",
     "statusDescription": "برای نمایش همه وضعیت‌ها، مقدار را روی همه بگذارید.",
+    "dataLimitDescription": "کاربران را بر اساس بازه محدودیت حجم بر حسب گیگابایت فیلتر می‌کند.",
+    "dataLimitMin": "حداقل محدودیت حجم (گیگابایت)",
+    "dataLimitMax": "حداکثر محدودیت حجم (گیگابایت)",
+    "dataLimitMinPlaceholder": "مثلاً 10",
+    "dataLimitMaxPlaceholder": "مثلاً 100",
+    "noDataLimit": "فقط کاربران بدون محدودیت حجم",
+    "noDataLimitDescription": "فقط کاربرانی را نشان می‌دهد که محدودیت حجم ندارند.",
+    "expireAfter": "انقضا بعد از",
+    "expireBefore": "انقضا قبل از",
+    "expireAfterPlaceholder": "تاریخ شروع را انتخاب کنید",
+    "expireBeforePlaceholder": "تاریخ پایان را انتخاب کنید",
+    "noExpire": "فقط کاربران بدون تاریخ انقضا",
+    "noExpireDescription": "فقط کاربرانی را نشان می‌دهد که تاریخ انقضا ندارند.",
     "byAdmin": "مدیر",
     "byGroup": "گروه",
     "displaySection": "نمایش جدول",

dashboard/public/statics/locales/ru.json

@@ -2188,6 +2188,19 @@
     "showSelectionCheckboxDescription": "Показывает чекбоксы строк для массового выбора.",
     "byStatus": "Статус",
     "statusDescription": "Оставьте «Все», чтобы включить все статусы.",
+    "dataLimitDescription": "Фильтрует пользователей по диапазону лимита трафика в гигабайтах.",
+    "dataLimitMin": "Минимальный лимит трафика (ГБ)",
+    "dataLimitMax": "Максимальный лимит трафика (ГБ)",
+    "dataLimitMinPlaceholder": "например, 10",
+    "dataLimitMaxPlaceholder": "например, 100",
+    "noDataLimit": "Только пользователи без лимита трафика",
+    "noDataLimitDescription": "Показывает только пользователей с безлимитным трафиком.",
+    "expireAfter": "Истекает после",
+    "expireBefore": "Истекает до",
+    "expireAfterPlaceholder": "Выберите начальную дату",
+    "expireBeforePlaceholder": "Выберите конечную дату",
+    "noExpire": "Только пользователи без даты истечения",
+    "noExpireDescription": "Показывает только пользователей без даты истечения срока.",
     "byAdmin": "Администратор",
     "byGroup": "Группа",
     "displaySection": "Отображение таблицы",

dashboard/public/statics/locales/zh.json

@@ -2244,6 +2244,19 @@
     "showSelectionCheckboxDescription": "显示行复选框以便批量选择。",
     "byStatus": "状态",
     "statusDescription": "保留为“全部”即可包含所有状态。",
+    "dataLimitDescription": "按以 GB 为单位的数据上限范围筛选用户。",
+    "dataLimitMin": "最小数据上限 (GB)",
+    "dataLimitMax": "最大数据上限 (GB)",
+    "dataLimitMinPlaceholder": "例如 10",
+    "dataLimitMaxPlaceholder": "例如 100",
+    "noDataLimit": "仅显示无数据上限的用户",
+    "noDataLimitDescription": "只显示数据上限为无限制的用户。",
+    "expireAfter": "到期晚于",
+    "expireBefore": "到期早于",
+    "expireAfterPlaceholder": "选择开始日期",
+    "expireBeforePlaceholder": "选择结束日期",
+    "noExpire": "仅显示无到期日期的用户",
+    "noExpireDescription": "只显示账户没有到期日期的用户。",
     "byAdmin": "管理员",
     "byGroup": "分组",
     "displaySection": "表格显示",

dashboard/src/components/dialogs/advance-search-modal.tsx

@@ -2,7 +2,9 @@ import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@/
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog'
+import { DatePicker } from '@/components/common/date-picker'
 import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form'
+import { Input } from '@/components/ui/input'
 import { LoaderButton } from '@/components/ui/loader-button'
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 import { Switch } from '@/components/ui/switch'
@@ -29,6 +31,8 @@ interface AdvanceSearchModalProps {
 export default function AdvanceSearchModal({ isDialogOpen, onOpenChange, form, onSubmit, isSudo, isApplying = false }: AdvanceSearchModalProps) {
   const dir = useDirDetection()
   const { t } = useTranslation()
+  const noDataLimitOnly = form.watch('no_data_limit')
+  const noExpireOnly = form.watch('no_expire')
 
   const { data: groupsData } = useGetGroupsSimple({ all: true })
 
@@ -167,6 +171,164 @@ export default function AdvanceSearchModal({ isDialogOpen, onOpenChange, form, o
                       }}
                     />
 
+                    <div className="grid gap-4 sm:grid-cols-2">
+                      <FormField
+                        control={form.control}
+                        name="data_limit_min"
+                        render={({ field }) => (
+                          <FormItem className="w-full">
+                            <FormLabel>{t('advanceSearch.dataLimitMin', { defaultValue: 'Minimum data limit (GB)' })}</FormLabel>
+                            <FormDescription>{t('advanceSearch.dataLimitDescription', { defaultValue: 'Filter users by data-limit range in gigabytes.' })}</FormDescription>
+                            <FormControl>
+                              <Input
+                                type="number"
+                                min="0"
+                                step="any"
+                                inputMode="decimal"
+                                placeholder={t('advanceSearch.dataLimitMinPlaceholder', { defaultValue: 'e.g. 10' })}
+                                value={field.value ?? ''}
+                                disabled={isApplying || noDataLimitOnly}
+                                onChange={event => {
+                                  const rawValue = event.target.value
+                                  field.onChange(rawValue === '' ? undefined : Number(rawValue))
+                                }}
+                              />
+                            </FormControl>
+                            <FormMessage />
+                          </FormItem>
+                        )}
+                      />
+
+                      <FormField
+                        control={form.control}
+                        name="data_limit_max"
+                        render={({ field }) => (
+                          <FormItem className="w-full">
+                            <FormLabel>{t('advanceSearch.dataLimitMax', { defaultValue: 'Maximum data limit (GB)' })}</FormLabel>
+                            <FormDescription>{t('advanceSearch.dataLimitDescription', { defaultValue: 'Filter users by data-limit range in gigabytes.' })}</FormDescription>
+                            <FormControl>
+                              <Input
+                                type="number"
+                                min="0"
+                                step="any"
+                                inputMode="decimal"
+                                placeholder={t('advanceSearch.dataLimitMaxPlaceholder', { defaultValue: 'e.g. 100' })}
+                                value={field.value ?? ''}
+                                disabled={isApplying || noDataLimitOnly}
+                                onChange={event => {
+                                  const rawValue = event.target.value
+                                  field.onChange(rawValue === '' ? undefined : Number(rawValue))
+                                }}
+                              />
+                            </FormControl>
+                            <FormMessage />
+                          </FormItem>
+                        )}
+                      />
+                    </div>
+
+                    <FormField
+                      control={form.control}
+                      name="no_data_limit"
+                      render={({ field }) => (
+                        <FormItem className="flex w-full items-start justify-between gap-4 rounded-md border p-4">
+                          <div className="space-y-1">
+                            <FormLabel>{t('advanceSearch.noDataLimit', { defaultValue: 'Only users with no data limit' })}</FormLabel>
+                            <FormDescription>{t('advanceSearch.noDataLimitDescription', { defaultValue: 'Shows users whose data limit is unlimited.' })}</FormDescription>
+                          </div>
+                          <FormControl>
+                            <Switch
+                              checked={field.value}
+                              disabled={isApplying}
+                              onCheckedChange={checked => {
+                                field.onChange(checked)
+                                if (checked) {
+                                  form.setValue('data_limit_min', undefined, { shouldDirty: true })
+                                  form.setValue('data_limit_max', undefined, { shouldDirty: true })
+                                }
+                              }}
+                            />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+
+                    <div className="grid gap-4 sm:grid-cols-2">
+                      <FormField
+                        control={form.control}
+                        name="expire_after"
+                        render={({ field }) => (
+                          <FormItem className="w-full">
+                            <FormControl>
+                              <div className={cn((isApplying || noExpireOnly) && 'pointer-events-none opacity-60')}>
+                                <DatePicker
+                                  mode="single"
+                                  date={field.value}
+                                  onDateChange={field.onChange}
+                                  label={t('advanceSearch.expireAfter', { defaultValue: 'Expire after' })}
+                                  placeholder={t('advanceSearch.expireAfterPlaceholder', { defaultValue: 'Select start date' })}
+                                  minDate={new Date('1900-01-01')}
+                                  className="[&_label]:text-sm"
+                                />
+                              </div>
+                            </FormControl>
+                            <FormMessage />
+                          </FormItem>
+                        )}
+                      />
+
+                      <FormField
+                        control={form.control}
+                        name="expire_before"
+                        render={({ field }) => (
+                          <FormItem className="w-full">
+                            <FormControl>
+                              <div className={cn((isApplying || noExpireOnly) && 'pointer-events-none opacity-60')}>
+                                <DatePicker
+                                  mode="single"
+                                  date={field.value}
+                                  onDateChange={field.onChange}
+                                  label={t('advanceSearch.expireBefore', { defaultValue: 'Expire before' })}
+                                  placeholder={t('advanceSearch.expireBeforePlaceholder', { defaultValue: 'Select end date' })}
+                                  minDate={new Date('1900-01-01')}
+                                  className="[&_label]:text-sm"
+                                />
+                              </div>
+                            </FormControl>
+                            <FormMessage />
+                          </FormItem>
+                        )}
+                      />
+                    </div>
+
+                    <FormField
+                      control={form.control}
+                      name="no_expire"
+                      render={({ field }) => (
+                        <FormItem className="flex w-full items-start justify-between gap-4 rounded-md border p-4">
+                          <div className="space-y-1">
+                            <FormLabel>{t('advanceSearch.noExpire', { defaultValue: 'Only users with no expire date' })}</FormLabel>
+                            <FormDescription>{t('advanceSearch.noExpireDescription', { defaultValue: 'Shows users whose account has no expire date.' })}</FormDescription>
+                          </div>
+                          <FormControl>
+                            <Switch
+                              checked={field.value}
+                              disabled={isApplying}
+                              onCheckedChange={checked => {
+                                field.onChange(checked)
+                                if (checked) {
+                                  form.setValue('expire_after', undefined, { shouldDirty: true })
+                                  form.setValue('expire_before', undefined, { shouldDirty: true })
+                                }
+                              }}
+                            />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+
                     <FormField
                       control={form.control}
                       name="group"