@7365admin1/core 3.32.2-staging.84 → 3.32.2-staging.85
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +5 -1
- package/dist/index.js +23 -5
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +23 -5
- package/dist/index.mjs.map +1 -1
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -4080,7 +4080,7 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
|
|
|
4080
4080
|
declare const visitors_namespace_collection = "visitor.transactions";
|
|
4081
4081
|
declare function useVisitorTransactionRepo(): {
|
|
4082
4082
|
add: (value: TVisitorTransaction, session?: ClientSession, returnValue?: boolean) => Promise<any>;
|
|
4083
|
-
getAll: ({ search, page, limit, sort, status, org, site, dateTo, dateFrom, type, checkedOut, plateNumber, tab, }: {
|
|
4083
|
+
getAll: ({ search, page, limit, sort, status, org, site, dateTo, dateFrom, type, checkedOut, plateNumber, tab, passOrKey, }: {
|
|
4084
4084
|
search?: string | undefined;
|
|
4085
4085
|
page?: number | undefined;
|
|
4086
4086
|
limit?: number | undefined;
|
|
@@ -4094,6 +4094,10 @@ declare function useVisitorTransactionRepo(): {
|
|
|
4094
4094
|
checkedOut?: Boolean | undefined;
|
|
4095
4095
|
plateNumber?: string | undefined;
|
|
4096
4096
|
tab?: string | undefined;
|
|
4097
|
+
passOrKey?: {
|
|
4098
|
+
keyId: string;
|
|
4099
|
+
type: string;
|
|
4100
|
+
} | undefined;
|
|
4097
4101
|
}) => Promise<{
|
|
4098
4102
|
items: any[];
|
|
4099
4103
|
pages: number;
|
package/dist/index.js
CHANGED
|
@@ -23714,7 +23714,8 @@ function useVisitorTransactionRepo() {
|
|
|
23714
23714
|
type = "",
|
|
23715
23715
|
checkedOut,
|
|
23716
23716
|
plateNumber = "",
|
|
23717
|
-
tab = ""
|
|
23717
|
+
tab = "",
|
|
23718
|
+
passOrKey
|
|
23718
23719
|
}) {
|
|
23719
23720
|
page = page > 0 ? page - 1 : 0;
|
|
23720
23721
|
const skip = page * limit;
|
|
@@ -23745,7 +23746,9 @@ function useVisitorTransactionRepo() {
|
|
|
23745
23746
|
},
|
|
23746
23747
|
...plateNumber && { plateNumber },
|
|
23747
23748
|
...status && { status },
|
|
23748
|
-
...tab == "Overnight Parking" && { isOvernightParking: true }
|
|
23749
|
+
...tab == "Overnight Parking" && { isOvernightParking: true },
|
|
23750
|
+
...passOrKey?.type == "pass" && { visitorPass: { $elemMatch: { keyId: new import_mongodb47.ObjectId(passOrKey.keyId) } } },
|
|
23751
|
+
...passOrKey?.type == "key" && { passKeys: { $elemMatch: { keyId: new import_mongodb47.ObjectId(passOrKey.keyId) } } }
|
|
23749
23752
|
};
|
|
23750
23753
|
const finalSort = Object.keys(sort).length > 0 ? sort : { latestDate: -1 };
|
|
23751
23754
|
try {
|
|
@@ -40119,7 +40122,20 @@ function useVisitorTransactionController() {
|
|
|
40119
40122
|
checkedOut: import_joi61.default.boolean().allow(null, ""),
|
|
40120
40123
|
plateNumber: import_joi61.default.string().optional().allow(null, ""),
|
|
40121
40124
|
order: import_joi61.default.string().valid(...Object.values(SortOrder)).default("asc" /* ASC */),
|
|
40122
|
-
tab: import_joi61.default.string().optional().allow(null, "")
|
|
40125
|
+
tab: import_joi61.default.string().optional().allow(null, ""),
|
|
40126
|
+
passOrKey: import_joi61.default.alternatives().try(
|
|
40127
|
+
import_joi61.default.object({
|
|
40128
|
+
keyId: import_joi61.default.string().regex(/^[0-9a-fA-F]{24}$/).required(),
|
|
40129
|
+
type: import_joi61.default.string().required()
|
|
40130
|
+
}),
|
|
40131
|
+
import_joi61.default.string().custom((value2, helpers) => {
|
|
40132
|
+
try {
|
|
40133
|
+
return JSON.parse(value2);
|
|
40134
|
+
} catch (e) {
|
|
40135
|
+
return helpers.error("any.invalid");
|
|
40136
|
+
}
|
|
40137
|
+
})
|
|
40138
|
+
).optional().allow(null)
|
|
40123
40139
|
});
|
|
40124
40140
|
const { error, value } = validation.validate(req.query, {
|
|
40125
40141
|
abortEarly: false
|
|
@@ -40144,7 +40160,8 @@ function useVisitorTransactionController() {
|
|
|
40144
40160
|
sort,
|
|
40145
40161
|
order,
|
|
40146
40162
|
plateNumber,
|
|
40147
|
-
tab
|
|
40163
|
+
tab,
|
|
40164
|
+
passOrKey
|
|
40148
40165
|
} = value;
|
|
40149
40166
|
const sortObj = {
|
|
40150
40167
|
[sort ? sort : "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
|
|
@@ -40162,7 +40179,8 @@ function useVisitorTransactionController() {
|
|
|
40162
40179
|
type,
|
|
40163
40180
|
checkedOut,
|
|
40164
40181
|
plateNumber,
|
|
40165
|
-
tab
|
|
40182
|
+
tab,
|
|
40183
|
+
passOrKey
|
|
40166
40184
|
});
|
|
40167
40185
|
res.status(200).json(data);
|
|
40168
40186
|
return;
|