diff --git a/.changeset/dull-trainers-count.md b/.changeset/dull-trainers-count.md new file mode 100644 index 0000000000..624a1456b8 --- /dev/null +++ b/.changeset/dull-trainers-count.md @@ -0,0 +1,6 @@ +--- +"medusa-plugin-ip-lookup": patch +"@medusajs/medusa": patch +--- + +fix(medusa-plugin-ip-lookup): Remove outdated Typeorm usage diff --git a/packages/medusa-plugin-ip-lookup/src/api/medusa-middleware.js b/packages/medusa-plugin-ip-lookup/src/api/medusa-middleware.js index 54b51e940e..61c8433eb9 100644 --- a/packages/medusa-plugin-ip-lookup/src/api/medusa-middleware.js +++ b/packages/medusa-plugin-ip-lookup/src/api/medusa-middleware.js @@ -7,8 +7,7 @@ export default { } const ipLookupService = req.scope.resolve("ipLookupService") - const manager = req.scope.resolve("manager") - const countryRepository = req.scope.resolve("countryRepository") + const regionService = req.scope.resolve("regionService") const ip = req.headers["x-forwarded-for"] || req.connection.remoteAddress @@ -19,17 +18,18 @@ export default { return } - const countryRepo = manager.getCustomRepository(countryRepository) - const country = await countryRepo.findOne({ - where: { iso_2: data.country_code.toLowerCase() }, - }) + const region = await regionService + .retrieveByCountryCode(data.country_code) + .catch(() => void 0) - // If country exists, add it to the body of the cart creation request - if (country?.region_id) { - req.body.region_id = country.region_id - req.body.country_code = country.iso_2 + if (!region) { + next() + return } + req.body.region_id = region.id + req.body.country_code = data.country_code.toLowerCase() + next() } catch (error) { next() diff --git a/packages/medusa/src/services/region.ts b/packages/medusa/src/services/region.ts index 10a4f45a81..af70622ae6 100644 --- a/packages/medusa/src/services/region.ts +++ b/packages/medusa/src/services/region.ts @@ -422,7 +422,7 @@ class RegionService extends TransactionBaseService { this.countryRepository_ ) - const query = buildQuery({ code }, {}) + const query = buildQuery({ iso_2: code.toLowerCase() }, {}) const country = await countryRepository.findOne(query) if (!country) {