Feat: Upgrade to V2 #6
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| __data__ | ||
| dist | ||
| node_modules | ||
| __admin-ui |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,25 +18,32 @@ import { | |
| InternalServerError, | ||
| EventBus, | ||
| TranslatorService, | ||
| StockMovementEvent, | ||
| StockLevelService, | ||
| Logger, | ||
| EntityHydrator, | ||
| } from '@vendure/core'; | ||
| import { BackInStock } from '../entity/back-in-stock.entity'; | ||
| import { BackInStockSubscriptionStatus } from '../types'; | ||
| import { | ||
| CreateBackInStockInput, | ||
| CreateBackInStockSubscriptionResult, | ||
| ErrorCode, | ||
| SortOrder, | ||
| UpdateBackInStockInput, | ||
| } from '../ui/generated/graphql-shop-api-types'; | ||
| import { BackInStockOptions } from '../back-in-stock.plugin'; | ||
| import { BackInStockEvent } from '../events/back-in-stock.event'; | ||
| import { OnApplicationBootstrap, Inject } from '@nestjs/common'; | ||
| import { PLUGIN_INIT_OPTIONS, loggerCtx } from '../constants'; | ||
|
|
||
| /** | ||
| * @description | ||
| * Contains methods relating to {@link BackInStock} entities. | ||
| * | ||
| */ | ||
| @Injectable() | ||
| export class BackInStockService implements OnApplicationBootstrap { | ||
| private readonly relations = ['productVariant', 'channel', 'customer']; | ||
|
|
||
| constructor( | ||
|
|
@@ -47,11 +54,54 @@ export class BackInStockService { | |
| private productVariantService: ProductVariantService, | ||
| private translatorService: TranslatorService, | ||
| private eventBus: EventBus, | ||
| @Inject(PLUGIN_INIT_OPTIONS) private options: BackInStockOptions | ||
|
There was a problem hiding this comment. - BackInStockPlugin.options
+ @Inject(PLUGIN_INIT_OPTIONS) private options: BackInStockOptions
|
||
| ) { } | ||
|
|
||
|
|
||
| onApplicationBootstrap() { | ||
| // Listen for stock movements and update subscriptions | ||
| this.eventBus.ofType(StockMovementEvent).subscribe(async event => { | ||
| // Refetch variants, because variants in event does not have all properties fetched from DB | ||
| const variants = await this.productVariantService.findByIds(event.ctx, event.stockMovements.map(sm => sm.productVariant.id)); | ||
|
There was a problem hiding this comment.
|
||
| // Check new stockLevel of each variant in the event | ||
| Promise.all(variants.map(async (productVariant) => { | ||
| const saleableStock = await this.productVariantService.getSaleableStockLevel(event.ctx, productVariant); | ||
| if (isNaN(saleableStock)) { | ||
| // This can happen when an event is fired during bootstrap, | ||
| // so Vendure can't yet resolve saleable stock for some reason | ||
| return; | ||
| } | ||
| if (saleableStock < 1) { | ||
| return; // Still not in stock | ||
| } | ||
| const backInStockSubscriptions = await this.findActiveForProductVariant( | ||
| event.ctx, | ||
| productVariant!.id, | ||
| { | ||
| take: this.options.limitEmailToStock ? saleableStock : undefined, | ||
| sort: { | ||
| createdAt: SortOrder.Asc, | ||
| }, | ||
| }, | ||
| ); | ||
| if (backInStockSubscriptions.totalItems < 1) { | ||
| return; // No subscriptions to notify | ||
| } | ||
| await Promise.all(backInStockSubscriptions.items.map(async subscription => | ||
| this.update(event.ctx, { | ||
| id: subscription.id, | ||
| status: BackInStockSubscriptionStatus.Notified, | ||
| }))); | ||
| })); | ||
| }); | ||
| } | ||
|
|
||
| async findOne(ctx: RequestContext, id: ID): Promise<BackInStock | null> { | ||
| return this.connection.getRepository(ctx, BackInStock).findOne({ | ||
| where: { | ||
| id | ||
| }, | ||
| relations: { productVariant: true, channel: true, customer: true }, | ||
|
There was a problem hiding this comment. New way of fetching relations in TypeOrm 0.3.0.
|
||
| }); | ||
| } | ||
|
|
||
|
|
@@ -80,16 +130,14 @@ export class BackInStockService { | |
| options?: ListQueryOptions<BackInStock>, | ||
| relations?: RelationPaths<Channel> | RelationPaths<Customer>, | ||
| ): Promise<PaginatedList<BackInStock>> { | ||
| return this.listQueryBuilder | ||
| .build(BackInStock, options, { | ||
| relations: relations || this.relations, | ||
| ctx, | ||
| // where: { | ||
| // productVariant: { id: productVariantId }, | ||
| // status: BackInStockSubscriptionStatus.Created, | ||
| // }, | ||
| }) | ||
| .getManyAndCount() | ||
| .then(async ([items, totalItems]) => { | ||
|
|
@@ -104,7 +152,7 @@ export class BackInStockService { | |
| ctx: RequestContext, | ||
| productVariantId: ID, | ||
| email: string, | ||
| ): Promise<BackInStock | null> { | ||
| const { channelId } = ctx; | ||
| const status = BackInStockSubscriptionStatus.Created; | ||
| const queryBuilder = this.connection | ||
|
|
@@ -140,6 +188,13 @@ export class BackInStockService { | |
| }; | ||
| } | ||
|
|
||
| if (!productVariant) { | ||
| return { | ||
| errorCode: ErrorCode.UnknownError, | ||
| message: `No variant found with ID ${input.productVariantId}`, | ||
| }; | ||
| } | ||
|
|
||
| const existingSubscription = await this.findActiveForProductVariantWithCustomer( | ||
| ctx, | ||
| productVariantId, | ||
|
|
@@ -169,14 +224,14 @@ export class BackInStockService { | |
| if (!subscription) { | ||
| throw new InternalServerError('Subscription not found'); | ||
| } | ||
| const updatedSubscription = patchEntity(subscription, input); | ||
| if (input.status === 'Notified') { | ||
| if (this.options.enableEmail) { | ||
| const translatedVariant = this.translatorService.translate(subscription.productVariant, ctx); | ||
| this.eventBus.publish( | ||
| new BackInStockEvent(ctx, subscription, translatedVariant, 'updated', subscription.email), | ||
| ); | ||
| Logger.info(`Publish "BackInStockEvent" for variant ${translatedVariant.sku} to notify "${subscription.email}"`, loggerCtx); | ||
| } else { | ||
| throw new InternalServerError('Email notification disabled'); | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Place generated inside
uidir, because Admin UI Angular compilation can't access anything outside theuidirectory