@mydoormot/app-types 1.7.9 → 1.7.11

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @mydoormot/app-types@1.7.8 build /Users/chuksben/Desktop/projects/microservices/mydoormot/packages/app-types
+> @mydoormot/app-types@1.7.10 build /Users/chuksben/Desktop/projects/microservices/mydoormot/packages/app-types
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -9,10 +9,10 @@
 ESM Build start
 CJS Build start
 CJS dist/index.cjs 7.84 KB
-CJS ⚡️ Build success in 46ms
+CJS ⚡️ Build success in 263ms
 ESM dist/index.js 6.17 KB
-ESM ⚡️ Build success in 46ms
+ESM ⚡️ Build success in 264ms
 DTS Build start
-DTS ⚡️ Build success in 674ms
-DTS dist/index.d.ts  17.77 KB
-DTS dist/index.d.cts 17.77 KB
+DTS ⚡️ Build success in 1001ms
+DTS dist/index.d.ts  18.04 KB
+DTS dist/index.d.cts 18.04 KB

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @mydoormot/app-types
 
+## 1.7.11
+
+### Patch Changes
+
+- Modified customer type
+
+## 1.7.10
+
+### Patch Changes
+
+- Added riderDetails to errands
+
 ## 1.7.9
 
 ### Patch Changes

package/dist/index.d.cts

@@ -15,6 +15,7 @@ type City = {
     isRiderActive: boolean;
     isPropertyActive: boolean;
     errandPrice?: number;
+    defaultCourierBusinessId?: string;
 };
 type State = {
     id: string;
@@ -355,9 +356,12 @@ interface PendingErrand {
 }
 interface Errand {
     id: string;
-    rider: string | Rider;
-    customerId?: string | User;
     nameOfItem: string;
+    userId?: string;
+    riderId?: string;
+    vehicleId?: string;
+    businessId?: string;
+    courierBusinessId?: string;
     pickupDetails: AddressDetails;
     deliveryDetails: AddressDetails;
     parcelSize: `${ParcelSize}`;
@@ -377,7 +381,7 @@ interface Errand {
     payOnDeliveryAmount?: string;
     additionalData?: string;
     deliveryDate?: Date;
-    city?: City;
+    cityId?: City;
     couponPrice?: number;
     price: number;
     coupon?: string | Coupon;
@@ -386,7 +390,6 @@ interface Errand {
     queuePosition?: number;
     isTest?: boolean;
     isInBusinessInvoice?: boolean;
-    businessId?: string;
     riderStartLocation?: {
         type: string;
         coordinates: number[];
@@ -400,7 +403,9 @@ interface Errand {
         coordinates: number[];
     };
     businessDetails?: Business;
-    customerDetails?: User;
+    userDetails?: User;
+    courierBusinessDetails?: Business;
+    riderDetails?: Rider;
 }
 interface AggregatedErrand extends Errand {
     parcelSize: `${ParcelSize}`;
@@ -422,7 +427,6 @@ interface AggregatedErrand extends Errand {
         stateCoords: number[];
     };
     riderUserDetails?: User;
-    business?: Business;
 }
 interface ErrandRating {
     createdAt: string;
@@ -543,8 +547,6 @@ type Notification = {
 
 interface Business {
     id: string;
-    pgId: string;
-    seqId: number;
     userId: string;
     name: string;
     description: string;
@@ -572,9 +574,8 @@ interface Business {
     updatedAt: string | NullOrUndefined | Date;
     verifiedAt: string | NullOrUndefined | Date;
     registrationCompletedAt: string | NullOrUndefined | Date;
-    mongoId: string;
-    version: number;
     isManaged: boolean | NullOrUndefined;
+    businessCategoryDetails: BusinessCategory | NullOrUndefined;
 }
 interface BusinessPg extends Business {
     pgId: any;
@@ -621,18 +622,24 @@ interface BusinessMember {
 
 interface Customer {
     id: string;
-    businessId: string | Business;
+    businessId: string;
     phoneNumber: string;
     fullName: string;
     cityId: string;
     address: string;
     landmark?: string;
-    errandsCount?: number;
-    city?: City;
-    state?: State;
+    createdAt: string;
+    updatedAt: string;
+    customerBusinessId?: string;
 }
 
 type TransactionType = 'sale' | 'expense';
+interface TransactionItem {
+    name: string;
+    quantity: number;
+    unitPrice: number;
+    totalPrice: number;
+}
 interface Transaction {
     id: string;
     type: TransactionType;
@@ -644,6 +651,7 @@ interface Transaction {
     userId: string;
     businessId?: string;
     categoryId?: string;
+    items?: TransactionItem[];
 }
 interface TransactionCategory {
     id: string;
@@ -708,4 +716,4 @@ declare enum LinkDestination {
 }
 type NullOrUndefined = null | undefined;
 
-export { type AddressDetails, AddressTypes, type AggregatedErrand, AuthType, type Business, type BusinessCategory, type BusinessMember, type BusinessPg, BusinessRole, type City, type Coupon, type Customer, DeliveryStatus, type Enterprise, type EnterpriseCategoryDoc, type EnterpriseSubCategoryDoc, EnterpriseType, type Errand, type ErrandDeliveryTiming, type ErrandPackagingQuality, type ErrandRating, type ErrandReview, type ErrandReviewLink, type ErrandRiderBehavior, ErrandStatus, type ErrandTimeline, GlobalRoles, type Invoice, InvoiceGenerationType, type InvoiceItem, InvoiceItemType, InvoiceStatus, type LatLng, LinkDestination, MembershipStatus, type Notification, type NotificationData, NotificationType, type NullOrUndefined, type PaginateResult, ParcelSize, PaymentOptions, type PendingErrand, type Rider, RoleType, type State, type Transaction, type TransactionCategory, type TransactionType, type TransactionWithCategory, type TransactionWithJoin, type User, type UserAddress, type Vehicle, type VehicleLog, type VehicleLogStatsSummary, VehicleLogType, type VehicleLogWithErrands, type VehicleLogWithRiderAndErrands, VehicleType, type VehicleWithRider, type Vendor, errandTimeline };
+export { type AddressDetails, AddressTypes, type AggregatedErrand, AuthType, type Business, type BusinessCategory, type BusinessMember, type BusinessPg, BusinessRole, type City, type Coupon, type Customer, DeliveryStatus, type Enterprise, type EnterpriseCategoryDoc, type EnterpriseSubCategoryDoc, EnterpriseType, type Errand, type ErrandDeliveryTiming, type ErrandPackagingQuality, type ErrandRating, type ErrandReview, type ErrandReviewLink, type ErrandRiderBehavior, ErrandStatus, type ErrandTimeline, GlobalRoles, type Invoice, InvoiceGenerationType, type InvoiceItem, InvoiceItemType, InvoiceStatus, type LatLng, LinkDestination, MembershipStatus, type Notification, type NotificationData, NotificationType, type NullOrUndefined, type PaginateResult, ParcelSize, PaymentOptions, type PendingErrand, type Rider, RoleType, type State, type Transaction, type TransactionCategory, type TransactionItem, type TransactionType, type TransactionWithCategory, type TransactionWithJoin, type User, type UserAddress, type Vehicle, type VehicleLog, type VehicleLogStatsSummary, VehicleLogType, type VehicleLogWithErrands, type VehicleLogWithRiderAndErrands, VehicleType, type VehicleWithRider, type Vendor, errandTimeline };

package/dist/index.d.ts

@@ -15,6 +15,7 @@ type City = {
     isRiderActive: boolean;
     isPropertyActive: boolean;
     errandPrice?: number;
+    defaultCourierBusinessId?: string;
 };
 type State = {
     id: string;
@@ -355,9 +356,12 @@ interface PendingErrand {
 }
 interface Errand {
     id: string;
-    rider: string | Rider;
-    customerId?: string | User;
     nameOfItem: string;
+    userId?: string;
+    riderId?: string;
+    vehicleId?: string;
+    businessId?: string;
+    courierBusinessId?: string;
     pickupDetails: AddressDetails;
     deliveryDetails: AddressDetails;
     parcelSize: `${ParcelSize}`;
@@ -377,7 +381,7 @@ interface Errand {
     payOnDeliveryAmount?: string;
     additionalData?: string;
     deliveryDate?: Date;
-    city?: City;
+    cityId?: City;
     couponPrice?: number;
     price: number;
     coupon?: string | Coupon;
@@ -386,7 +390,6 @@ interface Errand {
     queuePosition?: number;
     isTest?: boolean;
     isInBusinessInvoice?: boolean;
-    businessId?: string;
     riderStartLocation?: {
         type: string;
         coordinates: number[];
@@ -400,7 +403,9 @@ interface Errand {
         coordinates: number[];
     };
     businessDetails?: Business;
-    customerDetails?: User;
+    userDetails?: User;
+    courierBusinessDetails?: Business;
+    riderDetails?: Rider;
 }
 interface AggregatedErrand extends Errand {
     parcelSize: `${ParcelSize}`;
@@ -422,7 +427,6 @@ interface AggregatedErrand extends Errand {
         stateCoords: number[];
     };
     riderUserDetails?: User;
-    business?: Business;
 }
 interface ErrandRating {
     createdAt: string;
@@ -543,8 +547,6 @@ type Notification = {
 
 interface Business {
     id: string;
-    pgId: string;
-    seqId: number;
     userId: string;
     name: string;
     description: string;
@@ -572,9 +574,8 @@ interface Business {
     updatedAt: string | NullOrUndefined | Date;
     verifiedAt: string | NullOrUndefined | Date;
     registrationCompletedAt: string | NullOrUndefined | Date;
-    mongoId: string;
-    version: number;
     isManaged: boolean | NullOrUndefined;
+    businessCategoryDetails: BusinessCategory | NullOrUndefined;
 }
 interface BusinessPg extends Business {
     pgId: any;
@@ -621,18 +622,24 @@ interface BusinessMember {
 
 interface Customer {
     id: string;
-    businessId: string | Business;
+    businessId: string;
     phoneNumber: string;
     fullName: string;
     cityId: string;
     address: string;
     landmark?: string;
-    errandsCount?: number;
-    city?: City;
-    state?: State;
+    createdAt: string;
+    updatedAt: string;
+    customerBusinessId?: string;
 }
 
 type TransactionType = 'sale' | 'expense';
+interface TransactionItem {
+    name: string;
+    quantity: number;
+    unitPrice: number;
+    totalPrice: number;
+}
 interface Transaction {
     id: string;
     type: TransactionType;
@@ -644,6 +651,7 @@ interface Transaction {
     userId: string;
     businessId?: string;
     categoryId?: string;
+    items?: TransactionItem[];
 }
 interface TransactionCategory {
     id: string;
@@ -708,4 +716,4 @@ declare enum LinkDestination {
 }
 type NullOrUndefined = null | undefined;
 
-export { type AddressDetails, AddressTypes, type AggregatedErrand, AuthType, type Business, type BusinessCategory, type BusinessMember, type BusinessPg, BusinessRole, type City, type Coupon, type Customer, DeliveryStatus, type Enterprise, type EnterpriseCategoryDoc, type EnterpriseSubCategoryDoc, EnterpriseType, type Errand, type ErrandDeliveryTiming, type ErrandPackagingQuality, type ErrandRating, type ErrandReview, type ErrandReviewLink, type ErrandRiderBehavior, ErrandStatus, type ErrandTimeline, GlobalRoles, type Invoice, InvoiceGenerationType, type InvoiceItem, InvoiceItemType, InvoiceStatus, type LatLng, LinkDestination, MembershipStatus, type Notification, type NotificationData, NotificationType, type NullOrUndefined, type PaginateResult, ParcelSize, PaymentOptions, type PendingErrand, type Rider, RoleType, type State, type Transaction, type TransactionCategory, type TransactionType, type TransactionWithCategory, type TransactionWithJoin, type User, type UserAddress, type Vehicle, type VehicleLog, type VehicleLogStatsSummary, VehicleLogType, type VehicleLogWithErrands, type VehicleLogWithRiderAndErrands, VehicleType, type VehicleWithRider, type Vendor, errandTimeline };
+export { type AddressDetails, AddressTypes, type AggregatedErrand, AuthType, type Business, type BusinessCategory, type BusinessMember, type BusinessPg, BusinessRole, type City, type Coupon, type Customer, DeliveryStatus, type Enterprise, type EnterpriseCategoryDoc, type EnterpriseSubCategoryDoc, EnterpriseType, type Errand, type ErrandDeliveryTiming, type ErrandPackagingQuality, type ErrandRating, type ErrandReview, type ErrandReviewLink, type ErrandRiderBehavior, ErrandStatus, type ErrandTimeline, GlobalRoles, type Invoice, InvoiceGenerationType, type InvoiceItem, InvoiceItemType, InvoiceStatus, type LatLng, LinkDestination, MembershipStatus, type Notification, type NotificationData, NotificationType, type NullOrUndefined, type PaginateResult, ParcelSize, PaymentOptions, type PendingErrand, type Rider, RoleType, type State, type Transaction, type TransactionCategory, type TransactionItem, type TransactionType, type TransactionWithCategory, type TransactionWithJoin, type User, type UserAddress, type Vehicle, type VehicleLog, type VehicleLogStatsSummary, VehicleLogType, type VehicleLogWithErrands, type VehicleLogWithRiderAndErrands, VehicleType, type VehicleWithRider, type Vendor, errandTimeline };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mydoormot/app-types",
-  "version": "1.7.9",
+  "version": "1.7.11",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

package/src/business.ts

@@ -2,14 +2,11 @@ import { NullOrUndefined, User } from '.';
 
 export interface Business {
   id: string;
-  pgId: string;
-  seqId: number;
   userId: string;
   name: string;
   description: string;
   officeNumber: string;
   categoryId: string;
-
   address: string | NullOrUndefined;
   addressCoordinates:
     | number[]
@@ -39,9 +36,8 @@ export interface Business {
   updatedAt: string | NullOrUndefined | Date;
   verifiedAt: string | NullOrUndefined | Date;
   registrationCompletedAt: string | NullOrUndefined | Date;
-  mongoId: string;
-  version: number;
   isManaged: boolean | NullOrUndefined;
+  businessCategoryDetails: BusinessCategory | NullOrUndefined;
 }
 
 export interface BusinessPg extends Business {

package/src/customer.ts

@@ -1,16 +1,20 @@
-import { Business, City, State } from '.';
+// import { Business, City, State } from '.';
 
 export interface Customer {
   id: string;
-  businessId: string | Business;
+  businessId: string;
   phoneNumber: string;
   fullName: string;
   cityId: string;
   address: string;
   landmark?: string;
+  createdAt: string;
+  updatedAt: string;
+
+  customerBusinessId?: string;
 
   // From aggregation
-  errandsCount?: number;
-  city?: City;
-  state?: State;
+  // errandsCount?: number;
+  // city?: City;
+  // state?: State;
 }

package/src/errand.ts

@@ -112,10 +112,18 @@ export interface PendingErrand {
 }
 
 export interface Errand {
+  // NOTE: Deprecated fields
+  // rider: string | Rider;
+  // customerId?: string | User; // Deprecated
+
   id: string;
-  rider: string | Rider;
-  customerId?: string | User;
   nameOfItem: string;
+  userId?: string;
+  riderId?: string;
+  vehicleId?: string;
+  businessId?: string;
+  courierBusinessId?: string;
+
   pickupDetails: AddressDetails;
   deliveryDetails: AddressDetails;
   parcelSize: `${ParcelSize}`;
@@ -135,7 +143,7 @@ export interface Errand {
   payOnDeliveryAmount?: string;
   additionalData?: string;
   deliveryDate?: Date;
-  city?: City;
+  cityId?: City;
   couponPrice?: number;
   price: number;
   coupon?: string | Coupon;
@@ -144,12 +152,16 @@ export interface Errand {
   queuePosition?: number;
   isTest?: boolean;
   isInBusinessInvoice?: boolean;
-  businessId?: string;
   riderStartLocation?: { type: string; coordinates: number[] };
   riderPickupLocation?: { type: string; coordinates: number[] };
   riderDeliveryLocation?: { type: string; coordinates: number[] };
   businessDetails?: Business;
-  customerDetails?: User;
+  userDetails?: User;
+  courierBusinessDetails?: Business;
+
+  // new fields
+  riderDetails?: Rider;
+  // vehicleDetails?: Vehicle;
 }
 
 export interface AggregatedErrand extends Errand {
@@ -172,7 +184,6 @@ export interface AggregatedErrand extends Errand {
     stateCoords: number[];
   };
   riderUserDetails?: User;
-  business?: Business;
 }
 
 export interface ErrandTimeline {

package/src/location.ts

@@ -15,6 +15,7 @@ export type City = {
   isRiderActive: boolean;
   isPropertyActive: boolean;
   errandPrice?: number;
+  defaultCourierBusinessId?: string;
 };
 
 export type State = {

package/src/rider.ts

@@ -1,6 +1,6 @@
 import { Enterprise } from './enterprise';
 import { Errand } from './errand';
-import { City, State } from './location';
+import { State } from './location';
 import { User } from './user';
 
 export type Rider = {

package/src/transaction.ts

@@ -1,5 +1,12 @@
 export type TransactionType = 'sale' | 'expense';
 
+export interface TransactionItem {
+  name: string;
+  quantity: number;
+  unitPrice: number;
+  totalPrice: number;
+}
+
 export interface Transaction {
   id: string;
   type: TransactionType;
@@ -11,6 +18,7 @@ export interface Transaction {
   userId: string;
   businessId?: string;
   categoryId?: string;
+  items?: TransactionItem[];
 }
 
 export interface TransactionCategory {