Merge branch 'develop' into fix/2152

packages/modules/api-key/src/types/index.ts

@@ -3,7 +3,7 @@ import { IEventBusModuleService, Logger } from "@medusajs/types"
 
 export type InitializeModuleInjectableDependencies = {
   logger?: Logger
-  eventBusService?: IEventBusModuleService
+  eventBusModuleService?: IEventBusModuleService
 }
 
 export type CreateApiKeyDTO = {

packages/modules/currency/src/types/index.ts

@@ -2,5 +2,5 @@ import { IEventBusModuleService, Logger } from "@medusajs/types"
 
 export type InitializeModuleInjectableDependencies = {
   logger?: Logger
-  eventBusService?: IEventBusModuleService
+  eventBusModuleService?: IEventBusModuleService
 }

packages/modules/fulfillment/src/types/index.ts

@@ -7,7 +7,7 @@ import {
 
 export type InitializeModuleInjectableDependencies = {
   logger?: Logger
-  eventBusService?: IEventBusModuleService
+  eventBusModuleService?: IEventBusModuleService
 }
 
 export const FulfillmentIdentifiersRegistrationName =

packages/modules/order/src/types/index.ts

@@ -14,5 +14,5 @@ export * from "./utils"
 
 export type InitializeModuleInjectableDependencies = {
   logger?: Logger
-  eventBusService?: IEventBusModuleService
+  eventBusModuleService?: IEventBusModuleService
 }

packages/modules/providers/notification-local/integration-tests/__tests__/services.spec.ts

@@ -30,7 +30,7 @@ describe("Local notification provider", () => {
 
     expect(logSpy).toHaveBeenCalled()
     expect(logSpy).toHaveBeenCalledWith(
-      'Attempting to send a notification to: test@medusajs.com on the channel: email with template: some-template and data: {"username":"john-doe"}'
+      `Attempting to send a notification to: 'test@medusajs.com' on the channel: 'email' with template: 'some-template' and data: '{\"username\":\"john-doe\"}'`
     )
   })
 })

packages/modules/providers/notification-local/src/services/local.ts

@@ -38,9 +38,9 @@ export class LocalNotificationService extends AbstractNotificationProviderServic
     }
 
     const message =
-      `Attempting to send a notification to: ${notification.to}` +
-      ` on the channel: ${notification.channel} with template: ${notification.template}` +
-      ` and data: ${JSON.stringify(notification.data)}`
+      `Attempting to send a notification to: '${notification.to}'` +
+      ` on the channel: '${notification.channel}' with template: '${notification.template}'` +
+      ` and data: '${JSON.stringify(notification.data)}'`
 
     this.logger_.info(message)
     return {}

packages/modules/stock-location-next/src/services/stock-location-module.ts

@@ -26,7 +26,7 @@ import { UpsertStockLocationInput } from "@medusajs/types"
 import { promiseAll } from "@medusajs/utils"
 
 type InjectedDependencies = {
-  eventBusService: IEventBusService
+  eventBusModuleService: IEventBusService
   baseRepository: DAL.RepositoryService
   stockLocationService: ModulesSdkTypes.InternalModuleService<any>
   stockLocationAddressService: ModulesSdkTypes.InternalModuleService<any>
@@ -52,14 +52,14 @@ export default class StockLocationModuleService<
   >(StockLocation, generateMethodForModels, entityNameToLinkableKeysMap)
   implements IStockLocationServiceNext
 {
-  protected readonly eventBusService_: IEventBusService
+  protected readonly eventBusModuleService_: IEventBusService
   protected baseRepository_: DAL.RepositoryService
   protected readonly stockLocationService_: ModulesSdkTypes.InternalModuleService<TEntity>
   protected readonly stockLocationAddressService_: ModulesSdkTypes.InternalModuleService<TStockLocationAddress>
 
   constructor(
     {
-      eventBusService,
+      eventBusModuleService,
       baseRepository,
       stockLocationService,
       stockLocationAddressService,
@@ -72,7 +72,7 @@ export default class StockLocationModuleService<
     this.baseRepository_ = baseRepository
     this.stockLocationService_ = stockLocationService
     this.stockLocationAddressService_ = stockLocationAddressService
-    this.eventBusService_ = eventBusService
+    this.eventBusModuleService_ = eventBusModuleService
   }
 
   __joinerConfig(): ModuleJoinerConfig {

packages/modules/store/src/types/index.ts

@@ -3,7 +3,7 @@ import { IEventBusModuleService, Logger } from "@medusajs/types"
 
 export type InitializeModuleInjectableDependencies = {
   logger?: Logger
-  eventBusService?: IEventBusModuleService
+  eventBusModuleService?: IEventBusModuleService
 }
 
 export type UpdateStoreInput = StoreTypes.UpdateStoreDTO & { id: string }