Prepared ground for service implementation

src/db/dao/IBaseDAO.ts

@@ -0,0 +1,18 @@
+export interface IBaseDAO<D extends object> {
+  // Count documents that match a query
+  count(query: object): Promise<number>;
+
+  // Create a new document
+  create(data: Partial<D>): Promise<D>;
+
+  // Delete a document by ID
+  deleteById(userId: string): Promise<boolean>;
+
+  // Find documents that match a query
+  find(query: object): Promise<D[]>;
+
+  findById(userId: object): Promise<D | null>;
+
+  // Update a document by ID
+  updateById(userId: string, update: Partial<D>): Promise<D | null>;
+}

src/db/dao/IDaoFactory.ts

@@ -0,0 +1,17 @@
+import { IOffer } from "../model/IOffer";
+import { IOrder } from "../model/IOrder";
+import { ITokenTimetable } from "../model/ITokenTimetable";
+import { IUserCredits } from "../model/IUserCredits";
+import {
+  IOfferDao,
+  IOrderDao,
+  ITokenTimetableDao,
+  IUserCreditsDao,
+} from "./index";
+
+export interface IDaoFactory<K> {
+  getOfferDao(): IOfferDao<K, IOffer<K>>;
+  getOrderDao(): IOrderDao<K, IOrder<K>>;
+  getTokenTimetableDao(): ITokenTimetableDao<K, ITokenTimetable<K>>;
+  getUserCreditsDao(): IUserCreditsDao<K, IUserCredits<K>>;
+}

src/db/dao/IOfferDao.ts

@@ -0,0 +1,6 @@
+import {IOffer} from "../model/IOffer";
+import {IBaseDAO} from "./IBaseDAO";
+
+export interface IOfferDao<K extends object, D extends IOffer<K>>
+    extends IBaseDAO<D> {
+}

src/db/dao/IOrderDao.ts

@@ -0,0 +1,6 @@
+import {IOrder} from "../model/IOrder";
+import {IBaseDAO} from "./IBaseDAO";
+
+export interface IOrderDao<K extends object, D extends IOrder<K>>
+    extends IBaseDAO<D> {
+}

src/db/dao/ITokenTimetableDao.ts

@@ -0,0 +1,7 @@
+import { ITokenTimetable } from "../model/ITokenTimetable";
+import {IBaseDAO} from "./IBaseDAO";
+
+export interface ITokenTimetableDao<
+  K extends object,
+  D extends ITokenTimetable<K>,
+> extends IBaseDAO<D> {}

src/db/dao/IUserCreditsDao.ts

@@ -0,0 +1,7 @@
+import {ISubscription, IUserCredits} from "../model/IUserCredits";
+import {IBaseDAO} from "./IBaseDAO";
+
+export interface IUserCreditsDao<K extends object, D extends IUserCredits<K>>
+    extends IBaseDAO<D> {
+  findByUserId(userId: K): Promise<ISubscription<K>[]>;
+}

src/db/dao/index.ts

@@ -1,35 +1,7 @@
-import { IOffer } from "../model/IOffer";
-import { IOrder } from "../model/IOrder";
-import { ISubscription, IUserCredits } from "../model/IUserCredits";
+// index.ts
 
-export interface IUserCreditsDao<K extends object, D extends IUserCredits<K>>
-  extends BaseDAO<D> {
-  findByUserId(userId: K): Promise<ISubscription<K>[]>;
-}
-
-export interface IOfferDao<K extends object, D extends IOffer<K>>
-  extends BaseDAO<D> {}
-
-export interface IOrderDao<K extends object, D extends IOrder<K>>
-  extends BaseDAO<D> {}
-
-export interface ISubscriptionDao<K extends object> extends BaseDAO<K> {}
-
-export interface BaseDAO<D extends object> {
-  // Count documents that match a query
-  count(query: object): Promise<number>;
-
-  // Create a new document
-  create(data: Partial<D>): Promise<D>;
-
-  // Delete a document by ID
-  deleteById(userId: string): Promise<boolean>;
-
-  // Find documents that match a query
-  find(query: object): Promise<D[]>;
-
-  findById(userId: object): Promise<D | null>;
-
-  // Update a document by ID
-  updateById(userId: string, update: Partial<D>): Promise<D | null>;
-}
+export { IDaoFactory } from "./IDaoFactory";
+export { IOfferDao } from "./IOfferDao";
+export { IOrderDao } from "./IOrderDao";
+export { ITokenTimetableDao } from "./ITokenTimetableDao";
+export { IUserCreditsDao } from "./IUserCreditsDao";

src/db/model/index.ts

@@ -0,0 +1,6 @@
+// index.ts
+
+export { IOffer } from "./IOffer";
+export { IOrder } from "./IOrder";
+export { ITokenTimetable } from "./ITokenTimetable";
+export { IUserCredits } from "./IUserCredits";

src/impl/mongoose/dao/BaseMongooseDao.ts

@@ -1,19 +1,19 @@
 import { Document, Model } from "mongoose";
 
-import { BaseDAO } from "../../../db/dao";
+import { IBaseDAO } from "../../../db/dao/IBaseDAO";
 
 /**
  * Delegates all calls to mongoose in the constructor passed model property. This is an adapter to allow subclasses to implement local interfaces
  */
-export class BaseMongooseDao<D extends Document> implements BaseDAO<D> {
+export class BaseMongooseDao<D extends Document> implements IBaseDAO<D> {
   model: Model<D>;
 
   constructor(model: Model<D>) {
     this.model = model;
   }
 
   // Find document by ID
-  async findById(userId: string): Promise<D | null> {
+  async findById(userId: object): Promise<D | null> {
     const result = await this.model.findById(userId).exec();
     return result ? result.toObject() : null;
   }

src/impl/mongoose/dao/MongooseDaoFactory.ts

@@ -0,0 +1,52 @@
+import { ObjectId } from "mongoose";
+
+import {
+  IDaoFactory,
+  IOfferDao,
+  IOrderDao,
+  ITokenTimetableDao,
+  IUserCreditsDao,
+} from "../../../db/dao";
+import {
+  IOffer,
+  IOrder,
+  ITokenTimetable,
+  IUserCredits,
+} from "../../../db/model";
+import { OfferDao, OrderDao, TokenTimetableDao, UserCreditsDao } from ".";
+
+export class MongooseDaoFactory implements IDaoFactory<ObjectId> {
+  private readonly offerDao;
+  private readonly orderDao;
+  private readonly tokenTimetableDao;
+  private readonly userCreditsDao;
+
+  constructor(
+    private uri: string,
+    private dbName: string,
+  ) {
+    this.offerDao = new OfferDao(uri, dbName);
+    this.orderDao = new OrderDao(uri, dbName);
+    this.tokenTimetableDao = new TokenTimetableDao(uri, dbName);
+    this.userCreditsDao = new UserCreditsDao(uri, dbName);
+  }
+
+  getOfferDao(): IOfferDao<ObjectId, IOffer<ObjectId>> {
+    return this.offerDao;
+  }
+
+  getOrderDao(): IOrderDao<ObjectId, IOrder<ObjectId>> {
+    return this.orderDao;
+  }
+
+  getTokenTimetableDao(): ITokenTimetableDao<
+    ObjectId,
+    ITokenTimetable<ObjectId>
+  > {
+    return this.tokenTimetableDao;
+  }
+
+  getUserCreditsDao(): IUserCreditsDao<ObjectId, IUserCredits<ObjectId>> {
+    return this.userCreditsDao;
+  }
+}

src/impl/mongoose/dao/OfferDao.ts

@@ -1,6 +1,6 @@
 import { ObjectId } from "mongoose";
 
-import { IOfferDao } from "../../../db/dao";
+import { IOfferDao } from "../../../db/dao/IOfferDao";
 import { MongooseModels } from "../model";
 import { IMongooseOffer } from "../model/Offer";
 import { BaseMongooseDao } from "./BaseMongooseDao";

src/impl/mongoose/dao/OrderDao.ts

@@ -1,11 +1,11 @@
 import { ObjectId } from "mongoose";
 
-import { IOrderDao } from "../../../db/dao";
 import { MongooseModels } from "../model";
 import { IMongooseOrder } from "../model/Order";
 import { BaseMongooseDao } from "./BaseMongooseDao";
+import {IOrderDao} from "../../../db/dao/IOrderDao";
 
-export class OfferDao
+export class OrderDao
   extends BaseMongooseDao<IMongooseOrder>
   implements IOrderDao<ObjectId, IMongooseOrder>
 {

src/impl/mongoose/dao/TokenTimetableDao.ts

@@ -1,13 +1,13 @@
 import { ObjectId } from "mongoose";
 
-import { IOrderDao } from "../../../db/dao";
 import { MongooseModels } from "../model";
 import { IMongooseTokenTimetable } from "../model/TokenTimetable";
 import { BaseMongooseDao } from "./BaseMongooseDao";
+import { ITokenTimetableDao } from "../../../db/dao";
 
 export class TokenTimetableDao
   extends BaseMongooseDao<IMongooseTokenTimetable>
-  implements IOrderDao<ObjectId, IMongooseTokenTimetable>
+  implements ITokenTimetableDao<ObjectId, IMongooseTokenTimetable>
 {
   constructor(uri: string, dbName: string) {
     super(MongooseModels.getInstance(uri, dbName).tokenTimetableDao());

src/impl/mongoose/dao/UserCreditsDao.ts

@@ -1,10 +1,10 @@
 import { ObjectId } from "mongoose";
 
-import { IUserCreditsDao } from "../../../db/dao";
 import { ISubscription } from "../../../db/model/IUserCredits";
 import { MongooseModels } from "../model";
 import { IMongooseUserCredits } from "../model/UserCredits";
 import { BaseMongooseDao } from "./BaseMongooseDao";
+import {IUserCreditsDao} from "../../../db/dao/IUserCreditsDao";
 
 export class UserCreditsDao
   extends BaseMongooseDao<IMongooseUserCredits>

src/impl/mongoose/dao/index.ts

@@ -0,0 +1,6 @@
+// index.ts
+
+export { OfferDao } from "./OfferDao";
+export { OrderDao } from "./OrderDao";
+export { TokenTimetableDao } from "./TokenTimetableDao";
+export { UserCreditsDao } from "./UserCreditsDao";

src/service/BaseService.ts

@@ -1,8 +1,10 @@
-import { IOfferDao, ISubscriptionDao, IUserCreditsDao } from "../db/dao";
+import { ISubscriptionDao} from "../db/dao";
 import { IOffer } from "../db/model/IOffer";
 import { IOrder } from "../db/model/IOrder";
 import { ISubscription, IUserCredits } from "../db/model/IUserCredits";
 import { IPayment } from "./IPayment";
+import {IOfferDao} from "../db/dao/IOfferDao";
+import {IUserCreditsDao} from "../db/dao/IUserCreditsDao";
 
 export class BaseService<K extends object> implements IPayment<K> {
   private readonly userCreditsDAO: IUserCreditsDao<K, IUserCredits<K>>;