asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat(medusa): Expose an activeManager_ getter in TransactionBaseService (#3256)

Browse Source
This commit is contained in:
Adrien de Peretti
2023-02-16 10:26:23 +00:00
committed by GitHub
parent 75924b682f
commit aefe5aa133
68 changed files with 514 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/inventory/src/services/inventory-item.ts
+4 -11
View File
@@ -26,18 +26,11 @@ export default class InventoryItemService extends TransactionBaseService {
}
protected readonly eventBusService_: IEventBusService
protected manager_: EntityManager
protected transactionManager_: EntityManager | undefined
constructor({ eventBusService, manager }: InjectedDependencies) {
constructor({ eventBusService }: InjectedDependencies) {
super(arguments[0])
this.eventBusService_ = eventBusService
this.manager_ = manager
}
private getManager(): EntityManager {
return this.transactionManager_ ?? this.manager_
}
/**
@@ -49,7 +42,7 @@ export default class InventoryItemService extends TransactionBaseService {
selector: FilterableInventoryItemProps = {},
config: FindConfig<InventoryItem> = { relations: [], skip: 0, take: 10 }
): Promise<InventoryItemDTO[]> {
const queryBuilder = getListQuery(this.getManager(), selector, config)
const queryBuilder = getListQuery(this.activeManager_, selector, config)
return await queryBuilder.getMany()
}
@@ -62,7 +55,7 @@ export default class InventoryItemService extends TransactionBaseService {
selector: FilterableInventoryItemProps = {},
config: FindConfig<InventoryItem> = { relations: [], skip: 0, take: 10 }
): Promise<[InventoryItemDTO[], number]> {
const queryBuilder = getListQuery(this.getManager(), selector, config)
const queryBuilder = getListQuery(this.activeManager_, selector, config)
return await queryBuilder.getManyAndCount()
}
@@ -84,7 +77,7 @@ export default class InventoryItemService extends TransactionBaseService {
)
}
const manager = this.getManager()
const manager = this.activeManager_
const itemRepository = manager.getRepository(InventoryItem)
const query = buildQuery({ id: inventoryItemId }, config) as FindManyOptions
packages/inventory/src/services/inventory-level.ts
+7 -15
View File
@@ -23,20 +23,12 @@ export default class InventoryLevelService extends TransactionBaseService {
DELETED: "inventory-level.deleted",
}
protected manager_: EntityManager
protected transactionManager_: EntityManager | undefined
protected readonly eventBusService_: IEventBusService
constructor({ eventBusService, manager }: InjectedDependencies) {
constructor({ eventBusService }: InjectedDependencies) {
super(arguments[0])
this.eventBusService_ = eventBusService
this.manager_ = manager
}
private getManager(): EntityManager {
return this.transactionManager_ ?? this.manager_
}
/**
@@ -49,7 +41,7 @@ export default class InventoryLevelService extends TransactionBaseService {
selector: FilterableInventoryLevelProps = {},
config: FindConfig<InventoryLevel> = { relations: [], skip: 0, take: 10 }
): Promise<InventoryLevel[]> {
const manager = this.getManager()
const manager = this.activeManager_
const levelRepository = manager.getRepository(InventoryLevel)
const query = buildQuery(selector, config) as FindManyOptions
@@ -66,7 +58,7 @@ export default class InventoryLevelService extends TransactionBaseService {
selector: FilterableInventoryLevelProps = {},
config: FindConfig<InventoryLevel> = { relations: [], skip: 0, take: 10 }
): Promise<[InventoryLevel[], number]> {
const manager = this.getManager()
const manager = this.activeManager_
const levelRepository = manager.getRepository(InventoryLevel)
const query = buildQuery(selector, config) as FindManyOptions
@@ -91,7 +83,7 @@ export default class InventoryLevelService extends TransactionBaseService {
)
}
const manager = this.getManager()
const manager = this.activeManager_
const levelRepository = manager.getRepository(InventoryLevel)
const query = buildQuery({ id: inventoryLevelId }, config) as FindManyOptions
@@ -229,7 +221,7 @@ export default class InventoryLevelService extends TransactionBaseService {
locationIds = [locationIds]
}
const manager = this.getManager()
const manager = this.activeManager_
const levelRepository = manager.getRepository(InventoryLevel)
const result = await levelRepository
@@ -256,7 +248,7 @@ export default class InventoryLevelService extends TransactionBaseService {
locationIds = [locationIds]
}
const manager = this.getManager()
const manager = this.activeManager_
const levelRepository = manager.getRepository(InventoryLevel)
const result = await levelRepository
@@ -283,7 +275,7 @@ export default class InventoryLevelService extends TransactionBaseService {
locationIds = [locationIds]
}
const manager = this.getManager()
const manager = this.activeManager_
const levelRepository = manager.getRepository(InventoryLevel)
const result = await levelRepository
packages/inventory/src/services/inventory.ts
+26 -34
View File
@@ -36,8 +36,6 @@ export default class InventoryService
implements IInventoryService
{
protected readonly eventBusService_: IEventBusService
protected manager_: EntityManager
protected transactionManager_: EntityManager | undefined
protected readonly inventoryItemService_: InventoryItemService
protected readonly reservationItemService_: ReservationItemService
protected readonly inventoryLevelService_: InventoryLevelService
@@ -58,8 +56,6 @@ export default class InventoryService
}
this.eventBusService_ = eventBusService
this.manager_ = manager
this.inventoryItemService_ = new InventoryItemService({
eventBusService,
manager,
@@ -75,10 +71,6 @@ export default class InventoryService
})
}
private getManager(): EntityManager {
return this.transactionManager_ ?? this.manager_
}
/**
* Lists inventory items that match the given selector
* @param selector - the selector to filter inventory items by
@@ -90,7 +82,7 @@ export default class InventoryService
config: FindConfig<InventoryItemDTO> = { relations: [], skip: 0, take: 10 }
): Promise<[InventoryItemDTO[], number]> {
return await this.inventoryItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.listAndCount(selector, config)
}
@@ -105,7 +97,7 @@ export default class InventoryService
config: FindConfig<InventoryLevelDTO> = { relations: [], skip: 0, take: 10 }
): Promise<[InventoryLevelDTO[], number]> {
return await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.listAndCount(selector, config)
}
@@ -124,7 +116,7 @@ export default class InventoryService
}
): Promise<[ReservationItemDTO[], number]> {
return await this.reservationItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.listAndCount(selector, config)
}
@@ -139,7 +131,7 @@ export default class InventoryService
config?: FindConfig<InventoryItemDTO>
): Promise<InventoryItemDTO> {
const inventoryItem = await this.inventoryItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.retrieve(inventoryItemId, config)
return { ...inventoryItem }
}
@@ -155,7 +147,7 @@ export default class InventoryService
locationId: string
): Promise<InventoryLevelDTO> {
const [inventoryLevel] = await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.list(
{ inventory_item_id: inventoryItemId, location_id: locationId },
{ take: 1 }
@@ -179,7 +171,7 @@ export default class InventoryService
): Promise<ReservationItemDTO> {
// Verify that the item is stocked at the location
const [inventoryLevel] = await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.list(
{
inventory_item_id: input.inventory_item_id,
@@ -196,7 +188,7 @@ export default class InventoryService
}
const reservationItem = await this.reservationItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.create(input)
return { ...reservationItem }
@@ -211,7 +203,7 @@ export default class InventoryService
input: CreateInventoryItemInput
): Promise<InventoryItemDTO> {
const inventoryItem = await this.inventoryItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.create(input)
return { ...inventoryItem }
}
@@ -225,7 +217,7 @@ export default class InventoryService
input: CreateInventoryLevelInput
): Promise<InventoryLevelDTO> {
return await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.create(input)
}
@@ -240,7 +232,7 @@ export default class InventoryService
input: Partial<CreateInventoryItemInput>
): Promise<InventoryItemDTO> {
const inventoryItem = await this.inventoryItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.update(inventoryItemId, input)
return { ...inventoryItem }
}
@@ -251,7 +243,7 @@ export default class InventoryService
*/
async deleteInventoryItem(inventoryItemId: string): Promise<void> {
return await this.inventoryItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.delete(inventoryItemId)
}
@@ -265,7 +257,7 @@ export default class InventoryService
locationId: string
): Promise<void> {
const [inventoryLevel] = await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.list(
{ inventory_item_id: inventoryItemId, location_id: locationId },
{ take: 1 }
@@ -276,7 +268,7 @@ export default class InventoryService
}
return await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.delete(inventoryLevel.id)
}
@@ -293,7 +285,7 @@ export default class InventoryService
input: UpdateInventoryLevelInput
): Promise<InventoryLevelDTO> {
const [inventoryLevel] = await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.list(
{ inventory_item_id: inventoryItemId, location_id: locationId },
{ take: 1 }
@@ -307,7 +299,7 @@ export default class InventoryService
}
return await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.update(inventoryLevel.id, input)
}
@@ -322,7 +314,7 @@ export default class InventoryService
input: UpdateReservationItemInput
): Promise<ReservationItemDTO> {
return await this.reservationItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.update(reservationItemId, input)
}
@@ -332,7 +324,7 @@ export default class InventoryService
*/
async deleteReservationItemsByLineItem(lineItemId: string): Promise<void> {
return await this.reservationItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.deleteByLineItem(lineItemId)
}
@@ -342,7 +334,7 @@ export default class InventoryService
*/
async deleteReservationItem(reservationItemId: string): Promise<void> {
return await this.reservationItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.delete(reservationItemId)
}
@@ -360,7 +352,7 @@ export default class InventoryService
adjustment: number
): Promise<InventoryLevelDTO> {
const [inventoryLevel] = await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.list(
{ inventory_item_id: inventoryItemId, location_id: locationId },
{ take: 1 }
@@ -373,7 +365,7 @@ export default class InventoryService
}
const updatedInventoryLevel = await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.update(inventoryLevel.id, {
stocked_quantity: inventoryLevel.stocked_quantity + adjustment,
})
@@ -394,13 +386,13 @@ export default class InventoryService
): Promise<number> {
// Throws if item does not exist
await this.inventoryItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.retrieve(inventoryItemId, {
select: ["id"],
})
const availableQuantity = await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.getAvailableQuantity(inventoryItemId, locationIds)
return availableQuantity
@@ -419,13 +411,13 @@ export default class InventoryService
): Promise<number> {
// Throws if item does not exist
await this.inventoryItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.retrieve(inventoryItemId, {
select: ["id"],
})
const stockedQuantity = await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.getStockedQuantity(inventoryItemId, locationIds)
return stockedQuantity
@@ -444,13 +436,13 @@ export default class InventoryService
): Promise<number> {
// Throws if item does not exist
await this.inventoryItemService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.retrieve(inventoryItemId, {
select: ["id"],
})
const reservedQuantity = await this.inventoryLevelService_
.withTransaction(this.getManager())
.withTransaction(this.activeManager_)
.getReservedQuantity(inventoryItemId, locationIds)
return reservedQuantity
packages/inventory/src/services/reservation-item.ts
+6 -15
View File
@@ -1,17 +1,16 @@
import { EntityManager, FindManyOptions } from "typeorm"
import { isDefined, MedusaError } from "medusa-core-utils"
import {
FindConfig,
buildQuery,
IEventBusService,
FilterableReservationItemProps,
CreateReservationItemInput,
FilterableReservationItemProps,
FindConfig,
IEventBusService,
TransactionBaseService,
UpdateReservationItemInput,
} from "@medusajs/medusa"
import { ReservationItem } from "../models"
import { CONNECTION_NAME } from "../config"
import { InventoryLevelService } from "."
type InjectedDependencies = {
@@ -28,27 +27,19 @@ export default class ReservationItemService extends TransactionBaseService {
DELETED_BY_LINE_ITEM: "reservation-item.deleted-by-line-item",
}
protected manager_: EntityManager
protected transactionManager_: EntityManager | undefined
protected readonly eventBusService_: IEventBusService
protected readonly inventoryLevelService_: InventoryLevelService
constructor({
eventBusService,
manager,
inventoryLevelService,
}: InjectedDependencies) {
super(arguments[0])
this.manager_ = manager
this.eventBusService_ = eventBusService
this.inventoryLevelService_ = inventoryLevelService
}
private getManager(): EntityManager {
return this.transactionManager_ ?? this.manager_
}
/**
* Lists reservation items that match the provided filter.
* @param selector - Filters to apply to the reservation items.
@@ -59,7 +50,7 @@ export default class ReservationItemService extends TransactionBaseService {
selector: FilterableReservationItemProps = {},
config: FindConfig<ReservationItem> = { relations: [], skip: 0, take: 10 }
): Promise<ReservationItem[]> {
const manager = this.getManager()
const manager = this.activeManager_
const itemRepository = manager.getRepository(ReservationItem)
const query = buildQuery(selector, config) as FindManyOptions
@@ -76,7 +67,7 @@ export default class ReservationItemService extends TransactionBaseService {
selector: FilterableReservationItemProps = {},
config: FindConfig<ReservationItem> = { relations: [], skip: 0, take: 10 }
): Promise<[ReservationItem[], number]> {
const manager = this.getManager()
const manager = this.activeManager_
const itemRepository = manager.getRepository(ReservationItem)
const query = buildQuery(selector, config) as FindManyOptions
@@ -101,7 +92,7 @@ export default class ReservationItemService extends TransactionBaseService {
)
}
const manager = this.getManager()
const manager = this.activeManager_
const reservationItemRepository = manager.getRepository(ReservationItem)
const query = buildQuery({ id: reservationItemId }, config) as FindManyOptions