dgc-core 2.0.1 → 2.0.4

package/dist/enums/user.d.ts

@@ -2,6 +2,6 @@ export declare enum UserCollectorType {
     'Non-member' = -1,
     Free = 2,
     Rookie = 1,
-    Collector = 0,
-    Elite = 3
+    Collector = 3,
+    Elite = 0
 }

package/dist/enums/user.js

@@ -6,6 +6,6 @@ var UserCollectorType;
     UserCollectorType[UserCollectorType["Non-member"] = -1] = "Non-member";
     UserCollectorType[UserCollectorType["Free"] = 2] = "Free";
     UserCollectorType[UserCollectorType["Rookie"] = 1] = "Rookie";
-    UserCollectorType[UserCollectorType["Collector"] = 0] = "Collector";
-    UserCollectorType[UserCollectorType["Elite"] = 3] = "Elite";
+    UserCollectorType[UserCollectorType["Collector"] = 3] = "Collector";
+    UserCollectorType[UserCollectorType["Elite"] = 0] = "Elite";
 })(UserCollectorType || (exports.UserCollectorType = UserCollectorType = {}));

package/dist/giveaways/domain.js

@@ -177,16 +177,15 @@ function submitEntry(g, account, raw) {
         new Date(g.startsAt) > now ||
         new Date(g.closesAt) <= now)
         throw new http_error_1.HttpError('This giveaway is not accepting entries', 409);
-    const country = input.country || account.country;
+    const country = input.country;
     if (g.countries.length && (!country || !g.countries.includes(country)))
         throw new http_error_1.HttpError('This country is not eligible', 422);
     const at = now.toISOString();
     return {
         giveawayId: g._id,
         userId: account.userId,
-        fullName: [account.firstName, account.lastName].filter(Boolean).join(' ').trim() || account.email,
+        name: [account.firstName?.trim(), account.lastName?.trim()].filter(Boolean).join(' '),
         email: account.email,
-        username: account.username,
         country,
         _collectorType: account._collectorType,
         enteredAt: at,

package/dist/giveaways/giveaway-repository.d.ts

@@ -53,12 +53,11 @@ export declare class GiveawayRepository {
         _id: string;
         email: string;
         _collectorType: UserCollectorType | null;
+        name: string;
         giveawayId: import("../types").GiveawayObjectId;
         enteredAt: string;
-        username?: string | undefined;
         rulesSnapshot: string;
         userId: string;
-        fullName: string;
         address?: import("../types").GiveawayDeliveryAddress | undefined;
         country?: string | undefined;
         rulesAcceptedAt: string;

package/dist/giveaways/giveaway-repository.js

@@ -22,6 +22,14 @@ function serialize(record) {
     return { ...record, _id: record._id.toHexString() };
 }
 const statuses = Object.values(giveaway_2.GiveawayStatus);
+/** Normalize historical names and omit retired usernames without rewriting stored records. */
+function normalizeEntry(record) {
+    const legacy = record;
+    const fields = { ...legacy };
+    delete fields.fullName;
+    delete fields.username;
+    return { ...fields, name: record.name ?? legacy.fullName ?? '' };
+}
 function pagination(params) {
     const integer = (key, fallback, max) => {
         const value = Number(params.get(key));
@@ -411,9 +419,9 @@ class GiveawayRepository {
         const q = search(params);
         if (q)
             filter.$or = [
+                'name',
                 'fullName',
                 '_id',
-                'username',
                 'email',
                 'userId',
                 'address.line1',
@@ -470,7 +478,7 @@ class GiveawayRepository {
             .aggregate([...pipeline, { $facet: { data, total: [{ $count: 'count' }] } }])
             .next();
         return {
-            data: result?.data || [],
+            data: (result?.data || []).map(normalizeEntry),
             total: result?.total[0]?.count || 0,
             page,
             limit
@@ -542,6 +550,7 @@ class GiveawayRepository {
         return {
             data: data.map(w => ({
                 ...w,
+                entry: normalizeEntry(w.entry),
                 giveaway: { ...w.giveaway, status: (0, domain_1.effectiveStatus)(w.giveaway) }
             })),
             total,
@@ -716,7 +725,7 @@ class GiveawayRepository {
         })
             .limit(1000)
             .toArray();
-        const entries = rows;
+        const entries = rows.map(normalizeEntry);
         const existing = await this.winners.findOne({ giveawayId: id, replacedAt: null }, { projection: { _id: 1 } });
         (0, domain_1.confirmWinners)(g, entries, !!existing, 'preview', input);
         return { entries, giveaway: { ...g, status: (0, domain_1.effectiveStatus)(g) } };
@@ -851,7 +860,7 @@ class GiveawayRepository {
             const updated = { ...g, selection, revision: g.revision + 1 };
             await this.updateGiveaway(updated, g.revision, session);
             await this.audit(actor, 'Winner selected: ' + input.method, id, entry._id + (selection.reason ? ': ' + selection.reason : ''), session);
-            return { giveaway: updated, entry };
+            return { giveaway: updated, entry: normalizeEntry(entry) };
         });
     }
     async resetSelection(actor, id, revision, reason) {
@@ -956,7 +965,6 @@ class GiveawayRepository {
                 _id: entry._id,
                 giveawayId: entry.giveawayId,
                 enteredAt: entry.enteredAt,
-                username: entry.username,
                 tickets: 1,
                 rulesSnapshot: entry.rulesSnapshot
             },
@@ -1250,7 +1258,7 @@ class GiveawayRepository {
             ...marketingLookup
         ];
         if (marketingOnly)
-            pipeline.push({ $match: { marketingAllowed: true } }, { $project: { fullName: 1, email: 1 } });
+            pipeline.push({ $match: { marketingAllowed: true } }, { $project: { name: 1, fullName: 1, email: 1 } });
         const cursor = this.entries.aggregate(pipeline, {
             batchSize: 100
         });
@@ -1276,11 +1284,12 @@ class GiveawayRepository {
                             'Rules accepted'
                         ]
                 ]);
-                for await (const e of cursor) {
+                for await (const record of cursor) {
+                    const e = normalizeEntry(record);
                     const row = marketingOnly
-                        ? [e.fullName, e.email]
+                        ? [e.name, e.email]
                         : [
-                            e.fullName,
+                            e.name,
                             e.email,
                             e.address?.line1 || '',
                             e.address?.line2 || '',

package/dist/types/giveaway.d.ts

@@ -70,12 +70,11 @@ export type GiveawayEntry = {
     _id: GiveawayEntryId;
     giveawayId: GiveawayObjectId;
     userId: string;
-    fullName: string;
+    name: string;
     email: string;
     /** Historical entry addresses are retained; new entries collect delivery only at claim. */
     address?: GiveawayDeliveryAddress;
     country?: string;
-    username?: string;
     /** Null only for legacy entries whose exact collector tier was not recorded. */
     _collectorType: UserCollectorType | null;
     enteredAt: string;
@@ -182,8 +181,6 @@ export type GiveawayOverviewData = {
 };
 export type GiveawayUserProfile = Pick<FbUser, 'email' | 'firstName' | 'lastName' | '_collectorType'> & {
     userId: string;
-    username?: string;
-    country?: string;
 };
 export type GiveawayPhysicalClaim = {
     fullName: string;
@@ -191,7 +188,7 @@ export type GiveawayPhysicalClaim = {
     contactNumber: string;
 };
 export type GiveawayTicket = {
-    entry: Pick<GiveawayEntry, '_id' | 'giveawayId' | 'enteredAt' | 'username' | 'rulesSnapshot'> & {
+    entry: Pick<GiveawayEntry, '_id' | 'giveawayId' | 'enteredAt' | 'rulesSnapshot'> & {
         tickets: 1;
     };
     giveaway: Pick<Giveaway, '_id' | 'title' | 'image' | 'creditAmount' | 'closesAt' | 'status' | 'category'>;

package/dist/types/user.d.ts

@@ -9,7 +9,7 @@ export type FbUser = {
     };
     email: string;
     fcmTokens: Record<string, boolean>;
-    firstName: string;
+    firstName?: string;
     fundAmount: number;
     fundalert: number;
     id: string;
@@ -20,7 +20,7 @@ export type FbUser = {
     isFacebookUser: boolean;
     lastCardIndex: number;
     lastGradingTime: number;
-    lastName: string;
+    lastName?: string;
     soldCards: {
         count: number;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dgc-core",
-  "version": "2.0.1",
+  "version": "2.0.4",
   "description": "Shared DGC contracts, business rules and server utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",