From 60abb91b7c568c6c4cce3b2da7cfb8d54b078299 Mon Sep 17 00:00:00 2001
From: Adrien de Peretti <adrien.deperetti@gmail.com>
Date: Wed, 5 Apr 2023 12:39:46 +0200
Subject: [PATCH] chore(medusa): Migrate payment collection repository api
 (#3724)

* chore(medusa): Migrate payment repository api

* Create fresh-ties-hide.md
---
 .changeset/fresh-ties-hide.md                 |  5 ++++
 .../src/repositories/payment-collection.ts    | 30 +++++++++----------
 .../medusa/src/services/payment-collection.ts | 11 +++----
 3 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 .changeset/fresh-ties-hide.md

diff --git a/.changeset/fresh-ties-hide.md b/.changeset/fresh-ties-hide.md
new file mode 100644
index 0000000000..207b66ffcf
--- /dev/null
+++ b/.changeset/fresh-ties-hide.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+chore(medusa): Migrate payment repository api
diff --git a/packages/medusa/src/repositories/payment-collection.ts b/packages/medusa/src/repositories/payment-collection.ts
index 2eea4a7bb6..4005f8c477 100644
--- a/packages/medusa/src/repositories/payment-collection.ts
+++ b/packages/medusa/src/repositories/payment-collection.ts
@@ -1,27 +1,26 @@
 import { MedusaError } from "medusa-core-utils"
-import { PaymentCollection } from "./../models/payment-collection"
-import { FindConfig } from "../types/common"
+import { PaymentCollection } from "../models"
 import { dataSource } from "../loaders/database"
+import { FindManyOptions } from "typeorm"
 
 export const PaymentCollectionRepository = dataSource
   .getRepository(PaymentCollection)
   .extend({
     async getPaymentCollectionIdBySessionId(
       sessionId: string,
-      config: FindConfig<PaymentCollection> = {}
+      config: FindManyOptions<PaymentCollection> = {}
     ): Promise<PaymentCollection> {
       const paymentCollection = await this.find({
-        join: {
-          alias: "payment_col",
-          innerJoin: { payment_sessions: "payment_col.payment_sessions" },
-        },
         where: {
           payment_sessions: {
             id: sessionId,
           },
         },
-        relations: config.relations,
-        select: config.select,
+        relations: {
+          ...(config.relations ?? {}),
+          payment_sessions: true,
+        },
+        select: config.select ?? {},
       })
 
       if (!paymentCollection.length) {
@@ -36,20 +35,19 @@ export const PaymentCollectionRepository = dataSource
 
     async getPaymentCollectionIdByPaymentId(
       paymentId: string,
-      config: FindConfig<PaymentCollection> = {}
+      config: FindManyOptions<PaymentCollection> = {}
     ): Promise<PaymentCollection> {
       const paymentCollection = await this.find({
-        join: {
-          alias: "payment_col",
-          innerJoin: { payments: "payment_col.payments" },
-        },
         where: {
           payments: {
             id: paymentId,
           },
         },
-        relations: config.relations,
-        select: config.select,
+        relations: {
+          ...(config.relations ?? {}),
+          payment_sessions: true,
+        },
+        select: config.select ?? {},
       })
 
       if (!paymentCollection.length) {
diff --git a/packages/medusa/src/services/payment-collection.ts b/packages/medusa/src/services/payment-collection.ts
index 8021c071c5..d0b93f5aa3 100644
--- a/packages/medusa/src/services/payment-collection.ts
+++ b/packages/medusa/src/services/payment-collection.ts
@@ -417,11 +417,12 @@ export default class PaymentCollectionService extends TransactionBaseService {
         await paymentCollectionRepository.getPaymentCollectionIdBySessionId(
           sessionId,
           {
-            relations: [
-              "region",
-              "region.payment_providers",
-              "payment_sessions",
-            ],
+            relations: {
+              region: {
+                payment_providers: true,
+              },
+              payment_sessions: true,
+            },
           }
         )