update: commit for the new file
This commit is contained in:
@@ -144,7 +144,7 @@ export class SubscriptionsService {
|
||||
}
|
||||
//************************************ */
|
||||
|
||||
async getServiceSubscriptions(serviceId: string, queryDto: ServiceSubsQueryDto) {
|
||||
async All(serviceId: string, queryDto: ServiceSubsQueryDto) {
|
||||
const service = await this.danakServices.findServiceById(serviceId);
|
||||
|
||||
const { limit, skip } = PaginationUtils(queryDto);
|
||||
@@ -237,6 +237,45 @@ export class SubscriptionsService {
|
||||
}
|
||||
}
|
||||
//************************************ */
|
||||
async getServiceSubscriptions(serviceId: string, queryDto: ServiceSubsQueryDto) {
|
||||
const service = await this.danakServices.findServiceById(serviceId);
|
||||
|
||||
const { limit, skip } = PaginationUtils(queryDto);
|
||||
|
||||
const queryBuilder = this.subscriptionsPlanRepository
|
||||
.createQueryBuilder("subscription")
|
||||
.leftJoin("subscription.service", "service")
|
||||
.addSelect(["service.id"])
|
||||
// .leftJoin("subscription.discounts", "discount")
|
||||
// .addSelect(["discount.calculationType", "discount.amount", "discount.startDate", "discount.endDate", "discount.isActive"])
|
||||
.where("service.id = :serviceId", { serviceId });
|
||||
|
||||
if (queryDto.q) {
|
||||
queryBuilder.andWhere("subscription.name ILIKE :query", { query: `%${queryDto.q}%` });
|
||||
}
|
||||
|
||||
if (queryDto.isActive !== undefined) {
|
||||
queryBuilder.andWhere("subscription.isActive = :isActive", { isActive: queryDto.isActive === 1 });
|
||||
}
|
||||
|
||||
const [subscriptions, count] = await queryBuilder.skip(skip).take(limit).getManyAndCount();
|
||||
|
||||
return {
|
||||
service,
|
||||
subscriptions,
|
||||
count,
|
||||
pagination: true,
|
||||
};
|
||||
}
|
||||
//************************************ */
|
||||
|
||||
async getAllServiceSubscriptions(serviceIds: string[]) {
|
||||
const subscriptions = await this.subscriptionsPlanRepository.find({
|
||||
where: { service: { id: In(serviceIds) }, isActive: true },
|
||||
});
|
||||
return subscriptions;
|
||||
}
|
||||
//************************************ */
|
||||
|
||||
async countUserSubscriptions(userId: string) {
|
||||
const subscriptionCount = await this.userSubscriptionsRepository.count({
|
||||
@@ -335,8 +374,6 @@ export class SubscriptionsService {
|
||||
const startOfWeek = dayjs().startOf("week").toDate();
|
||||
const endOfWeek = dayjs().endOf("week").toDate();
|
||||
|
||||
console.log(startOfWeek, endOfWeek);
|
||||
|
||||
const sales = await this.userSubscriptionsRepository
|
||||
.createQueryBuilder("userSubscription")
|
||||
.select("DATE(userSubscription.startDate)", "date")
|
||||
|
||||
Reference in New Issue
Block a user