chore(merge): merge develop into main

Badminton-Apps · Oct 22, 2024 · fc33381 · fc33381
2 parents 315623a + 788966c
commit fc33381
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/libs/backend/database/src/types/pushSubscription.type.ts b/libs/backend/database/src/types/pushSubscription.type.ts
@@ -1,4 +1,4 @@
-import { Field, InputType, ObjectType, OmitType, PartialType } from '@nestjs/graphql';
+import { Field, InputType, Int, ObjectType, OmitType, PartialType } from '@nestjs/graphql';
 
 @ObjectType({ description: 'An Exception' })
 export class PushSubscriptionKeysType {
@@ -12,8 +12,9 @@ export class PushSubscriptionKeysType {
 export class PushSubscriptionType {
   @Field(() => String, { nullable: true })
   endpoint?: string;
-  @Field(() => String, { nullable: true })
-  expirationTime?: string;
+
+  @Field(() => Int, { nullable: true })
+  expirationTime?: number;
 
   @Field(() => PushSubscriptionKeysType, { nullable: true })
   keys?: PushSubscriptionKeys;

diff --git a/nx.json b/nx.json
@@ -127,5 +127,5 @@
       "skipTests": true
     }
   },
-  "nxCloudAccessToken": "NTM2YmYwOTAtM2NlZC00ZDFmLTkwMDAtNzljM2Y4MDFiMTBmfHJlYWQtd3JpdGU="
+  "nxCloudAccessToken": "NGRkMmFkZjktYmRjZi00OTFhLWJkMzEtZDcwZjMwM2Q3MzkwfHJlYWQtd3JpdGU="
 }