@nyig/models 0.2.14 → 0.2.17

package/index.mjs

@@ -18,8 +18,10 @@ var zBPaymentInfo = z.object({
 });
 
 // src/interface/booking/bUserInfo.ts
+import { Types } from "mongoose";
 import { z as z2 } from "zod";
 var zBUserInfo = z2.object({
+  userId: z2.instanceof(Types.ObjectId).optional(),
   firstName: z2.string(),
   lastName: z2.string(),
   rank: z2.string(),
@@ -43,10 +45,10 @@ import { z as z13 } from "zod";
 
 // src/interface/mongoose/mongoose.ts
 import { z as z3 } from "zod";
-import { Types } from "mongoose";
+import { Types as Types2 } from "mongoose";
 function extendZodObjectForMongoose(original) {
   return original.extend({
-    _id: z3.instanceof(Types.ObjectId),
+    _id: z3.instanceof(Types2.ObjectId),
     createdAt: z3.coerce.date().optional(),
     updatedAt: z3.coerce.date().optional()
   });
@@ -61,6 +63,7 @@ var AttendState = /* @__PURE__ */ ((AttendState2) => {
 })(AttendState || {});
 
 // src/interface/tracking/attendance.ts
+import { Types as Types3 } from "mongoose";
 import { z as z5 } from "zod";
 
 // src/interface/payment/tuition.ts
@@ -80,9 +83,8 @@ var CampOption = /* @__PURE__ */ ((CampOption2) => {
 })(CampOption || {});
 
 // src/interface/tracking/attendance.ts
-import { Types as Types2 } from "mongoose";
 var zAttendance = z5.object({
-  student: z5.instanceof(Types2.ObjectId),
+  student: z5.instanceof(Types3.ObjectId),
   states: z5.array(z5.nativeEnum(AttendState)),
   tuition: zTuition,
   paid: z5.boolean().optional(),
@@ -91,12 +93,12 @@ var zAttendance = z5.object({
 var zMAttendance = extendZodObjectForMongoose(zAttendance);
 
 // src/interface/tracking/campTracker.ts
-import { Types as Types3 } from "mongoose";
+import { Types as Types4 } from "mongoose";
 import { z as z6 } from "zod";
 var zCampTracker = z6.object({
-  course: z6.instanceof(Types3.ObjectId),
-  teacher: z6.instanceof(Types3.ObjectId),
-  semester: z6.instanceof(Types3.ObjectId),
+  course: z6.instanceof(Types4.ObjectId),
+  teacher: z6.instanceof(Types4.ObjectId),
+  semester: z6.instanceof(Types4.ObjectId),
   /**
    * occurrences are tracked by week for camps
    */
@@ -110,11 +112,11 @@ var zCampTracker = z6.object({
 var zMCampTracker = extendZodObjectForMongoose(zCampTracker);
 
 // src/interface/tracking/classTracker.ts
-import { Types as Types6 } from "mongoose";
+import { Types as Types7 } from "mongoose";
 import { z as z9 } from "zod";
 
 // src/interface/payment/invoice.ts
-import { Types as Types4 } from "mongoose";
+import { Types as Types5 } from "mongoose";
 import { z as z7 } from "zod";
 
 // src/interface/payment/paymentMethod.ts
@@ -132,12 +134,12 @@ var zDiscount = z7.object({
   amount: z7.number()
 });
 var zInvoiceItem = z7.object({
-  course: z7.instanceof(Types4.ObjectId),
+  course: z7.instanceof(Types5.ObjectId),
   price: z7.number(),
   units: z7.number()
 });
 var zInvoicePackage = z7.object({
-  student: z7.instanceof(Types4.ObjectId),
+  student: z7.instanceof(Types5.ObjectId),
   items: z7.array(zInvoiceItem)
 });
 var zInvoice = z7.object({
@@ -148,13 +150,13 @@ var zInvoice = z7.object({
   shipping: z7.number().int().min(1).optional(),
   paid: z7.nativeEnum(PaymentMethod).optional(),
   notes: z7.string().optional(),
-  createdBy: z7.instanceof(Types4.ObjectId),
-  lastEditBy: z7.instanceof(Types4.ObjectId).optional()
+  createdBy: z7.instanceof(Types5.ObjectId),
+  lastEditBy: z7.instanceof(Types5.ObjectId).optional()
 });
 var zMInvoice = extendZodObjectForMongoose(zInvoice);
 
 // src/interface/payment/teacherPayment.ts
-import { Types as Types5 } from "mongoose";
+import { Types as Types6 } from "mongoose";
 import { z as z8 } from "zod";
 var zTeacherPaymentRow = z8.object({
   course: z8.string(),
@@ -163,7 +165,7 @@ var zTeacherPaymentRow = z8.object({
   wage: z8.number()
 });
 var zTeacherPayment = z8.object({
-  teacher: z8.instanceof(Types5.ObjectId),
+  teacher: z8.instanceof(Types6.ObjectId),
   rows: z8.array(zTeacherPaymentRow),
   paid: z8.boolean().optional()
 });
@@ -171,9 +173,9 @@ var zMTeacherPayment = extendZodObjectForMongoose(zTeacherPayment);
 
 // src/interface/tracking/classTracker.ts
 var zClassTracker = z9.object({
-  course: z9.instanceof(Types6.ObjectId),
-  teacher: z9.instanceof(Types6.ObjectId),
-  student: z9.instanceof(Types6.ObjectId),
+  course: z9.instanceof(Types7.ObjectId),
+  teacher: z9.instanceof(Types7.ObjectId),
+  student: z9.instanceof(Types7.ObjectId),
   classTimes: z9.array(z9.coerce.date()),
   completedList: z9.array(z9.boolean()),
   /**
@@ -182,6 +184,7 @@ var zClassTracker = z9.object({
   completed: z9.boolean().optional(),
   tuition: zTuition.optional(),
   paid: z9.boolean().optional(),
+  paused: z9.boolean().optional(),
   notes: z9.string().optional()
 });
 var zMClassTracker = extendZodObjectForMongoose(zClassTracker);
@@ -230,11 +233,11 @@ var zCourse = z11.object({
   /**
    * @unit SECONDS - Duration of the course in seconds
    */
-  duration: z11.number(),
+  duration: z11.number().int("Duration in seconds must be a whole number").min(1, "Duration in seconds must not be less than or equal to 0"),
   /**
    * @unit CENTS - Price of the course in cents
    */
-  price: z11.number(),
+  price: z11.number().int("Tuition must be a whole number in cents").min(1, "Tuition must not be less than or equal to 0"),
   description: z11.string().optional(),
   /**
    * NYIG School locations
@@ -247,20 +250,20 @@ var zCourse = z11.object({
   /**
    * Camp tuition for half-day option
    */
-  halfCampTuition: z11.number(),
+  halfCampTuition: z11.number().int("Tuition must be a whole number in cents").min(1, "Tuition must not be less than or equal to 0").optional(),
   /**
    * Camp tuition for full-day option
    */
-  fullCampTuition: z11.number()
+  fullCampTuition: z11.number().int("Tuition must be a whole number in cents").min(1, "Tuition must not be less than or equal to 0").optional()
 });
 var zMCourse = extendZodObjectForMongoose(zCourse);
 
 // src/interface/tracking/groupTracker.ts
-import { Types as Types7 } from "mongoose";
+import { Types as Types8 } from "mongoose";
 var zGroupTracker = z12.object({
-  course: z12.instanceof(Types7.ObjectId),
-  teacher: z12.instanceof(Types7.ObjectId),
-  semester: z12.instanceof(Types7.ObjectId),
+  course: z12.instanceof(Types8.ObjectId),
+  teacher: z12.instanceof(Types8.ObjectId),
+  semester: z12.instanceof(Types8.ObjectId),
   scheduleData: zScheduleData,
   /**
    * occurrences are tracked by week for Groups
@@ -269,7 +272,7 @@ var zGroupTracker = z12.object({
   /**
    * attendances are tracked by week for Groups
    */
-  attendances: z12.array(z12.instanceof(Types7.ObjectId)),
+  attendances: z12.array(z12.instanceof(Types8.ObjectId)),
   /**
    * public-facing ID of the course instance, e.g., 101
    */
@@ -288,7 +291,6 @@ var zMGroupTracker = extendZodObjectForMongoose(zGroupTracker);
 
 // src/interface/booking/campBooking.ts
 var zCampBooking = z13.object({
-  userId: z13.string().optional(),
   ctId: z13.string().optional(),
   isOnline: z13.boolean(),
   classDates: z13.string(),
@@ -298,10 +300,10 @@ var zCampBooking = z13.object({
 var zMCampBooking = extendZodObjectForMongoose(zCampBooking);
 
 // src/interface/booking/groupBooking.ts
+import { Types as Types9 } from "mongoose";
 import { z as z14 } from "zod";
 var zGroupBooking = z14.object({
-  userId: z14.string().optional(),
-  gtId: z14.string().optional(),
+  gtId: z14.instanceof(Types9.ObjectId).optional(),
   isTrial: z14.boolean().optional(),
   isOnline: z14.boolean(),
   classDate: z14.string().optional(),
@@ -310,11 +312,11 @@ var zGroupBooking = z14.object({
 var zMGroupBooking = extendZodObjectForMongoose(zGroupBooking);
 
 // src/interface/booking/privateBooking.ts
+import { Types as Types10 } from "mongoose";
 import { z as z15 } from "zod";
 var zPrivateBooking = z15.object({
-  userId: z15.string().optional(),
-  courseId: z15.string(),
-  teacherId: z15.string(),
+  courseId: z15.instanceof(Types10.ObjectId),
+  teacherId: z15.instanceof(Types10.ObjectId),
   classDate: z15.string().optional()
 }).merge(zBUserInfo).merge(zBPaymentInfo);
 var zMPrivateBooking = extendZodObjectForMongoose(zPrivateBooking);
@@ -346,7 +348,7 @@ var zImageDef = z17.object({
 });
 
 // src/interface/reporting/reportTicket.ts
-import { Types as Types8 } from "mongoose";
+import { Types as Types11 } from "mongoose";
 import { z as z18 } from "zod";
 
 // src/interface/reporting/ticketStatus.ts
@@ -360,8 +362,8 @@ var TicketStatus = /* @__PURE__ */ ((TicketStatus2) => {
 
 // src/interface/reporting/reportTicket.ts
 var zReportTicket = z18.object({
-  requester: z18.instanceof(Types8.ObjectId),
-  resolver: z18.instanceof(Types8.ObjectId),
+  requester: z18.instanceof(Types11.ObjectId),
+  resolver: z18.instanceof(Types11.ObjectId),
   status: z18.nativeEnum(TicketStatus),
   title: z18.string(),
   description: z18.string()
@@ -395,7 +397,7 @@ var zSemester = z19.object({
 var zMSemester = extendZodObjectForMongoose(zSemester);
 
 // src/interface/tournament/tConfig.ts
-import { Types as Types9 } from "mongoose";
+import { Types as Types12 } from "mongoose";
 import { z as z21 } from "zod";
 
 // src/interface/tournament/table.ts
@@ -458,7 +460,7 @@ var zTConfig = z21.object({
   /**
    * List of ticket object IDs for this tournament
    */
-  tickets: z21.array(z21.instanceof(Types9.ObjectId)),
+  tickets: z21.array(z21.instanceof(Types12.ObjectId)),
   /**
    * If false, the tournament registration is closed
    */
@@ -475,14 +477,14 @@ var zTConfig = z21.object({
 var zMTConfig = extendZodObjectForMongoose(zTConfig);
 
 // src/interface/tournament/tReg.ts
-import { Types as Types11 } from "mongoose";
+import { Types as Types14 } from "mongoose";
 import { z as z23 } from "zod";
 
 // src/interface/tournament/tTicketReg.ts
 import { z as z22 } from "zod";
-import { Types as Types10 } from "mongoose";
+import { Types as Types13 } from "mongoose";
 var zTTicketReg = z22.object({
-  ticket: z22.instanceof(Types10.ObjectId),
+  ticket: z22.instanceof(Types13.ObjectId),
   /**
    * integer minimum 1, otherwise no ticket is being bought
    */
@@ -492,7 +494,7 @@ var zTTicketReg = z22.object({
 // src/interface/tournament/tReg.ts
 var zTReg = z23.object({
   agaId: z23.string(),
-  tournamentId: z23.instanceof(Types11.ObjectId),
+  tournamentId: z23.instanceof(Types14.ObjectId),
   tickets: z23.array(zTTicketReg),
   /**
    * @units CENTS - Donation in cents
@@ -505,7 +507,7 @@ var zTReg = z23.object({
   /**
    * Mongoose ID of the admin that edited the registration
    */
-  edited: z23.instanceof(Types11.ObjectId).optional()
+  edited: z23.instanceof(Types14.ObjectId).optional()
 }).merge(zBUserInfo).merge(zBPaymentInfo);
 var zMTReg = extendZodObjectForMongoose(zTReg);
 
@@ -579,50 +581,46 @@ var GoRank = /* @__PURE__ */ ((GoRank2) => {
 })(GoRank || {});
 
 // src/interface/user/user.ts
-import { z as z26 } from "zod";
-
-// src/interface/user/userRoles.ts
 import { z as z25 } from "zod";
-var zUserRoles = z25.object({
-  user: z25.number().int(),
-  admin: z25.number().int(),
-  superadmin: z25.number().int()
-});
-
-// src/interface/user/user.ts
-import { Types as Types12 } from "mongoose";
-var zUser = z26.object({
-  name: z26.string().min(2).max(100),
-  username: z26.string().optional(),
-  password: z26.string().optional(),
-  roles: zUserRoles.optional(),
-  email: z26.string().email().max(100).optional(),
-  address: z26.string().optional(),
-  country: z26.string().optional(),
-  phoneNumber: z26.string().optional(),
-  birthDate: z26.string().optional()
+import { Types as Types15 } from "mongoose";
+var zUser = z25.object({
+  name: z25.string().min(2).max(100),
+  username: z25.string().optional(),
+  password: z25.string().optional(),
+  roles: z25.array(z25.number().int()),
+  email: z25.string().email().max(100).optional(),
+  address: z25.string().optional(),
+  country: z25.string().length(2, {
+    message: "Enter the 2-letter country code"
+  }).optional(),
+  phoneNumber: z25.string().regex(/^\d{10}/, {
+    message: `Please enter a valid 10-digit US phone number with numbers only`
+  }).optional(),
+  birthDate: z25.string().regex(/^\d{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])$/, {
+    message: "Enter a valid date in yyyy-mm-dd format"
+  }).optional()
 });
 var zMUser = extendZodObjectForMongoose(zUser);
 var zStudent = zUser.extend({
-  rank: z26.nativeEnum(GoRank),
-  guardian: z26.instanceof(Types12.ObjectId).optional()
+  rank: z25.nativeEnum(GoRank),
+  guardian: z25.instanceof(Types15.ObjectId).optional()
 });
 var zMStudent = extendZodObjectForMongoose(zStudent);
 var zTeacher = zUser.extend({
-  rank: z26.nativeEnum(GoRank),
+  rank: z25.nativeEnum(GoRank),
   /**
    * Inactive teachers are not shown on public endpoints
    */
-  isInactive: z26.boolean().optional(),
+  isInactive: z25.boolean().optional(),
   /**
    * Teacher's position, e.g., instructor, president
    */
-  title: z26.string().optional(),
+  title: z25.string().optional(),
   /**
    * Teacher's bio text describing experience
    * new lines will be rendered as paragraphs
    */
-  bio: z26.string().optional(),
+  bio: z25.string().optional(),
   /** Format is illustrated below, where teacher is available
    * Mon 9-12am 3-6pm & Tue 10-12am 6-10pm
    * [
@@ -635,9 +633,17 @@ var zTeacher = zUser.extend({
    *  [],
    * ]
    */
-  available: z26.array(z26.array(z26.array(z26.number()))).optional()
+  available: z25.array(z25.array(z25.array(z25.number()))).optional()
 });
 var zMTeacher = extendZodObjectForMongoose(zTeacher);
+
+// src/interface/user/userRoles.ts
+import { z as z26 } from "zod";
+var zUserRoles = z26.object({
+  user: z26.number().int(),
+  admin: z26.number().int(),
+  superadmin: z26.number().int()
+});
 export {
   AgeGroup,
   AttendState,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nyig/models",
-  "version": "0.2.14",
+  "version": "0.2.17",
   "license": "MIT",
   "main": "index.js",
   "module": "index.mjs",