web: Fix subscription creation

ducksmanager · Dec 31, 2024 · ebbc6d3 · ebbc6d3
1 parent 55907a4
commit ebbc6d3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/apps/web/src/pages/collection/subscriptions.vue b/apps/web/src/pages/collection/subscriptions.vue
@@ -66,7 +66,7 @@ alias: [/collection/abonnements]
       </b-col>
     </b-row>
     <Subscription
-      v-if="currentSubscription && currentSubscription.id === null"
+      v-if="currentSubscription && !currentSubscription.id"
       :subscription="currentSubscription"
       is-edit
       @start-edit="currentSubscription = newSubscription"

diff --git a/packages/api/services/collection/subscriptions/index.ts b/packages/api/services/collection/subscriptions/index.ts
@@ -66,21 +66,22 @@ export async function upsertSubscription(
   ) {
     return null;
   }
+
+  const dates = {
+    startDate: new Date(subscription.startDate),
+    endDate: new Date(subscription.endDate),
+  };
   await prismaDm.subscription.upsert({
-    update: {
-      startDate: subscription.startDate!,
-      endDate: subscription.endDate!,
-    },
+    update: dates,
     create: {
       publicationcode: subscription.publicationcode!,
       users: {
         connect: { id: userId },
       },
-      startDate: subscription.startDate!,
-      endDate: subscription.endDate!,
+      ...dates
     },
     where: {
-      id: id!,
+      id: id || 0,
     },
   });
 }
diff --git a/packages/types/EditSubscription.ts b/packages/types/EditSubscription.ts
@@ -1,6 +1,6 @@
 export type EditSubscription = {
   id: number | null;
-  publicationcode: string | null;
-  startDate: string | null;
-  endDate: string | null;
+  publicationcode: string;
+  startDate: string;
+  endDate: string;
 };