Adjust enrollment typing

unchainedshop · Dec 10, 2024 · d66c33c · d66c33c
1 parent a96dda7
commit d66c33c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 37 deletions.
diff --git a/packages/api/src/resolvers/mutations/enrollments/createEnrollment.ts b/packages/api/src/resolvers/mutations/enrollments/createEnrollment.ts
@@ -34,22 +34,19 @@ export default async function createEnrollment(
 
   if (product.type !== ProductTypes.PlanProduct) throw new ProductWrongTypeError({ type: product.type });
 
-  const enrollment = await modules.enrollments.create(
-    {
-      billingAddress,
-      configuration,
-      contact,
-      countryCode: countryContext,
-      currencyCode: currencyContext,
-      delivery,
-      meta,
-      payment,
-      productId,
-      quantity,
-      userId,
-    },
-    context,
-  );
+  const enrollment = await modules.enrollments.create({
+    billingAddress,
+    configuration,
+    contact,
+    countryCode: countryContext,
+    currencyCode: currencyContext,
+    delivery,
+    meta,
+    payment,
+    productId,
+    quantity,
+    userId,
+  });
 
   return await services.enrollments.initializeEnrollment(
     enrollment,

diff --git a/packages/api/src/resolvers/mutations/quotations/requestQuotation.ts b/packages/api/src/resolvers/mutations/quotations/requestQuotation.ts
@@ -1,14 +1,13 @@
 import { log } from '@unchainedshop/logger';
 import { Context } from '../../../context.js';
 import { ProductNotFoundError, InvalidIdError } from '../../../errors.js';
-import { resolveBestCurrency } from '@unchainedshop/utils';
 
 export default async function requestQuotation(
   root: never,
   params: { productId: string; configuration: Array<{ key: string; value: string }> },
   context: Context,
 ) {
-  const { countryContext, modules, services, userId } = context;
+  const { countryContext, currencyContext, modules, services, userId } = context;
   const { productId, configuration } = params;
 
   log(`mutation requestQuotation ${productId} ${configuration ? JSON.stringify(configuration) : ''}`, {
@@ -20,15 +19,11 @@ export default async function requestQuotation(
   if (!(await modules.products.productExists({ productId })))
     throw new ProductNotFoundError({ productId });
 
-  const countryObject = await modules.countries.findCountry({ isoCode: countryContext });
-  const currencies = await modules.currencies.findCurrencies({ includeInactive: false });
-  const currency = resolveBestCurrency(countryObject.defaultCurrencyCode, currencies);
-
   const newQuotation = await modules.quotations.create({
     userId,
     productId,
     countryCode: countryContext,
-    currency,
+    currency: currencyContext,
     configuration,
   });
 

diff --git a/packages/core-enrollments/src/module/configureEnrollmentsModule.ts b/packages/core-enrollments/src/module/configureEnrollmentsModule.ts
@@ -17,7 +17,6 @@ import {
 } from '@unchainedshop/mongodb';
 import { EnrollmentsCollection } from '../db/EnrollmentsCollection.js';
 import { enrollmentsSettings, EnrollmentsSettingsOptions } from '../enrollments-settings.js';
-import { resolveBestCurrency } from '@unchainedshop/utils';
 
 export type EnrollmentQuery = {
   status?: Array<EnrollmentStatus>;
@@ -215,24 +214,18 @@ export const configureEnrollmentsModule = async ({
       return enrollment;
     },
 
-    create: async (
-      { countryCode, currencyCode, ...enrollmentData }: Omit<Enrollment, 'status' | 'periods' | 'log'>,
-      unchainedAPI,
-    ): Promise<Enrollment> => {
-      const { modules } = unchainedAPI;
-
-      const countryObject = await modules.countries.findCountry({ isoCode: countryCode });
-      const currencies = await modules.currencies.findCurrencies({ includeInactive: false });
-      const currency =
-        currencyCode || resolveBestCurrency(countryObject.defaultCurrencyCode, currencies);
-
+    create: async ({
+      countryCode,
+      currencyCode,
+      ...enrollmentData
+    }: Omit<Enrollment, 'status' | 'periods' | 'log'>): Promise<Enrollment> => {
       const { insertedId: enrollmentId } = await Enrollments.insertOne({
         _id: generateDbObjectId(),
         created: new Date(),
         ...enrollmentData,
         status: EnrollmentStatus.INITIAL,
         periods: [],
-        currencyCode: currency,
+        currencyCode,
         countryCode,
         configuration: enrollmentData.configuration || [],
         log: [],

diff --git a/packages/core/src/services/createEnrollmentFromCheckout.ts b/packages/core/src/services/createEnrollmentFromCheckout.ts
@@ -59,7 +59,7 @@ export const createEnrollmentFromCheckoutService = async (
         unchainedAPI,
       );
 
-      const enrollment = await modules.enrollments.create(enrollmentData, unchainedAPI);
+      const enrollment = await modules.enrollments.create(enrollmentData);
       return await initializeEnrollmentService(
         enrollment,
         {