Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions apps/backend/.env.template
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ COOKIE_SECRET=supersecret
DATABASE_URL=postgres://[user]:[password]@[address]:[port]/$DB_NAME
DB_NAME=

STRIPE_SECRET_API_KEY=supersecret
STRIPE_CONNECTED_ACCOUNTS_WEBHOOK_SECRET=supersecret
STRIPE_SECRET_API_KEY=
STRIPE_CONNECTED_ACCOUNTS_WEBHOOK_SECRET=
EASYPOST_API_KEY=
20 changes: 20 additions & 0 deletions apps/backend/medusa-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ module.exports = defineConfig({
{ resolve: './src/modules/configuration' },
{ resolve: './src/modules/order-return-request' },
{ resolve: './src/modules/requests' },
{ resolve: './src/modules/default-shipping-options' },
{
resolve: './src/modules/taxcode',
options: {
Expand All @@ -47,6 +48,25 @@ module.exports = defineConfig({
}
]
}
},
{
resolve: '@medusajs/medusa/fulfillment',
options: {
providers: [
{
resolve: '@medusajs/medusa/fulfillment-manual',
id: 'manual'
},
{
resolve: './src/modules/easypost',
id: 'easypost',
options: {
apiKey: process.env.EASYPOST_API_KEY || 'supersecret',
mockEasyPostClient: true
}
}
]
}
}
]
})
19 changes: 10 additions & 9 deletions apps/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,15 @@
"generate:oas": "medusa-oas oas --type combined --paths ./src/api"
},
"dependencies": {
"@medusajs/admin-sdk": "latest",
"@medusajs/cli": "^2.1.0",
"@medusajs/framework": "latest",
"@medusajs/medusa": "latest",
"@mikro-orm/core": "5.9.7",
"@mikro-orm/knex": "5.9.7",
"@mikro-orm/migrations": "5.9.7",
"@mikro-orm/postgresql": "5.9.7",
"@easypost/api": "^7.5.5",
"@medusajs/admin-sdk": "2.4.0",
"@medusajs/cli": "2.4.0",
"@medusajs/framework": "2.4.0",
"@medusajs/medusa": "2.4.0",
"@mikro-orm/core": "6.4.3",
"@mikro-orm/knex": "6.4.3",
"@mikro-orm/migrations": "6.4.3",
"@mikro-orm/postgresql": "6.4.3",
"awilix": "^8.0.1",
"pg": "^8.13.0",
"stripe": "^17.4.0"
Expand All @@ -43,7 +44,7 @@
"@eslint/js": "^9.15.0",
"@medusajs/medusa-oas-cli": "^2.1.0",
"@medusajs/test-utils": "latest",
"@mikro-orm/cli": "5.9.7",
"@mikro-orm/cli": "6.4.3",
"@swc/core": "1.5.7",
"@swc/jest": "^0.2.36",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import { getEasyPostOptions } from '#/workflows/default-shipping-options/workflows'

import { MedusaRequest, MedusaResponse } from '@medusajs/framework/http'

// TODO OAS to be fixed
/**
* @oas [get] /admin/default-shipping-option/easypost
* operationId: "GetDefaultShippingOptionEasypost"
* summary: "List EasyPost Shipping Options"
* description: "Retrieves a list of available shipping options from EasyPost."
* x-authenticated: true
* security:
* - api_token: []
* - cookie_auth: []
* tags:
* - Default Shipping Option
* responses:
* "200":
* description: OK
* content:
* application/json:
* schema:
* type: object
* properties:
* result:
* type: array
* items:
* type: object
* properties:
* id:
* type: string
* description: The EasyPost shipping option ID
* name:
* type: string
* description: The name of the shipping option
*/
export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
const { result } = await getEasyPostOptions(req.scope).run()
res.json(result)
}
25 changes: 25 additions & 0 deletions apps/backend/src/api/admin/default-shipping-option/middlewares.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import {
MiddlewareRoute,
validateAndTransformBody,
validateAndTransformQuery
} from '@medusajs/framework'

import { AdminCreateDefaultSippingOption } from './validators'

export const defaultShippingOptionMiddlewares: MiddlewareRoute[] = [
// {
// method: ['GET'],
// matcher: '/admin/default-shipping-option',
// middlewares: [validateAndTransformQuery(, {})]
// },
{
method: ['POST'],
matcher: '/admin/default-shipping-option',
middlewares: [validateAndTransformBody(AdminCreateDefaultSippingOption)]
}
// {
// method: ['POST'],
// matcher: '/admin/default-shipping-option/:id',
// middlewares: [validateAndTransformBody()]
// }
]
23 changes: 23 additions & 0 deletions apps/backend/src/api/admin/default-shipping-option/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { MedusaRequest, MedusaResponse } from '@medusajs/framework/http'

import { AdminCreateDefaultShippingOptionType } from './validators'

export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
// const carriers = await getAdminCarriersList(req.scope).run()
const query = req.scope.resolve('query')

const { data } = await query.graph({
entity: 'default_shipping_option',
fields: ['*']
})
res.json(data)
}

export const POST = async (
req: MedusaRequest<AdminCreateDefaultShippingOptionType>,
res: MedusaResponse
) => {
// const carriers = await getAdminCarriersList(req.scope).run()

res.send('To be implemented')
}
16 changes: 16 additions & 0 deletions apps/backend/src/api/admin/default-shipping-option/validators.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { z } from 'zod'

/**
* @schema AdminCreateDefaultSippingOption
* type: object
* properties:
* id:
* type: string
* description: The external id from easypost api.
*/
export type AdminCreateDefaultShippingOptionType = z.infer<
typeof AdminCreateDefaultSippingOption
>
export const AdminCreateDefaultSippingOption = z.object({
id: z.string()
})
4 changes: 3 additions & 1 deletion apps/backend/src/api/admin/middlewares.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { MiddlewareRoute } from '@medusajs/framework'

import { configurationMiddleware } from './configuration/middlewares'
import { defaultShippingOptionMiddlewares } from './default-shipping-option/middlewares'
import { orderSetsMiddlewares } from './order-sets/middlewares'
import { requestsMiddlewares } from './requests/middlewares'
import { returnRequestsMiddlewares } from './return-request/middlewares'
Expand All @@ -9,5 +10,6 @@ export const adminMiddlewares: MiddlewareRoute[] = [
...orderSetsMiddlewares,
...requestsMiddlewares,
...configurationMiddleware,
...returnRequestsMiddlewares
...returnRequestsMiddlewares,
...defaultShippingOptionMiddlewares
]
9 changes: 9 additions & 0 deletions apps/backend/src/links/seller-default-shipping-option.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { defineLink } from '@medusajs/framework/utils'

import DefaultShippingOptionModule from '../modules/default-shipping-options'
import SellerModule from '../modules/seller'

export default defineLink(SellerModule.linkable.seller, {
linkable: DefaultShippingOptionModule.linkable.defaultSellerShippingOption,
isList: true
})
9 changes: 9 additions & 0 deletions apps/backend/src/modules/default-shipping-options/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Module } from '@medusajs/framework/utils'

import DefaultShippingOptionModuleService from './service'

export const DEFAULT_SHIPPING_OPTION_MODULE = 'default_shipping_option'

export default Module(DEFAULT_SHIPPING_OPTION_MODULE, {
service: DefaultShippingOptionModuleService
})
Loading