Add GraphQL-Scalars [Fixes part of #1082] (#1085)

* Change scalars

* Revert Upload Scalar

* Move scalar Upload to congen config

* Move from Timestamp to DateTime

* Move mongo to datetime

* Revert "Move mongo to datetime"

This reverts commit e58516f.

* Move ID to ObjectID

* Revert ObjectID

codegen.ts

@@ -1,7 +1,8 @@
 import type { CodegenConfig } from "@graphql-codegen/cli";
 
 const config: CodegenConfig = {
-  schema: ["./src/typeDefs/**/*.ts"],
+  // Points to our schema and the additional scalar Upload which is added by Apollo-Server at runtime
+  schema: ["./src/typeDefs/**/*.ts", "scalar Upload"],
 
   generates: {
     "./src/types/generatedGraphQLTypes.ts": {

package.json

@@ -51,6 +51,7 @@
     "firebase-admin": "^10.3.0",
     "graphql": "^15.8.0",
     "graphql-depth-limit": "^1.1.0",
+    "graphql-scalars": "^1.20.1",
     "graphql-upload": "^12.0.0",
     "helmet": "^4.6.0",
     "i18n": "^0.13.4",

src/resolvers/index.ts

@@ -8,6 +8,16 @@ import { Mutation } from "./Mutation";
 import { Organization } from "./Organization";
 import { Query } from "./Query";
 import { Subscription } from "./Subscription";
+import {
+  DateResolver,
+  DateTimeResolver,
+  EmailAddressResolver,
+  LatitudeResolver,
+  LongitudeResolver,
+  PhoneNumberResolver,
+  TimeResolver,
+  URLResolver,
+} from "graphql-scalars";
 
 export const resolvers: Resolvers = {
   DirectChat,
@@ -19,4 +29,14 @@ export const resolvers: Resolvers = {
   Organization,
   Query,
   Subscription,
+
+  // graphql-scalar resolver
+  Date: DateResolver,
+  DateTime: DateTimeResolver,
+  EmailAddress: EmailAddressResolver,
+  Latitude: LatitudeResolver,
+  Longitude: LongitudeResolver,
+  PhoneNumber: PhoneNumberResolver,
+  Time: TimeResolver,
+  URL: URLResolver,
 };

src/typeDefs/inputs.ts

@@ -36,18 +36,18 @@ export const inputs = gql`
   input EventInput {
     title: String!
     description: String!
-    startDate: String!
-    endDate: String
-    startTime: String
-    endTime: String
+    startDate: Date!
+    endDate: Date
+    startTime: Time
+    endTime: Time
     allDay: Boolean!
     recurring: Boolean!
     recurrance: Recurrance
     isPublic: Boolean!
     isRegisterable: Boolean!
     location: String
-    latitude: Float
-    longitude: Float
+    latitude: Latitude
+    longitude: Longitude
     organizationId: ID!
   }
 
@@ -108,7 +108,7 @@ export const inputs = gql`
   }
 
   input LoginInput {
-    email: String!
+    email: EmailAddress!
     password: String!
   }
 
@@ -124,7 +124,7 @@ export const inputs = gql`
     attendees: String
     isPublic: Boolean!
     visibleInSearch: Boolean!
-    apiUrl: String
+    apiUrl: URL
     image: String
     tags: [String!]!
   }
@@ -151,20 +151,20 @@ export const inputs = gql`
     description_contains: String
     description_starts_with: String
 
-    apiUrl: String
-    apiUrl_not: String
-    apiUrl_in: [String!]
-    apiUrl_not_in: [String!]
-    apiUrl_contains: String
-    apiUrl_starts_with: String
+    apiUrl: URL
+    apiUrl_not: URL
+    apiUrl_in: [URL!]
+    apiUrl_not_in: [URL!]
+    apiUrl_contains: URL
+    apiUrl_starts_with: URL
 
     visibleInSearch: Boolean
 
     isPublic: Boolean
   }
 
   input OTPInput {
-    email: String!
+    email: EmailAddress!
   }
 
   input PluginFieldInput {
@@ -184,8 +184,8 @@ export const inputs = gql`
     _id: ID
     text: String!
     title: String
-    imageUrl: String
-    videoUrl: String
+    imageUrl: URL
+    videoUrl: URL
     organizationId: ID!
   }
 
@@ -219,7 +219,7 @@ export const inputs = gql`
   input TaskInput {
     title: String!
     description: String
-    deadline: String
+    deadline: DateTime
   }
 
   input UpdateEventInput {
@@ -229,14 +229,14 @@ export const inputs = gql`
     recurrance: Recurrance
     isPublic: Boolean
     isRegisterable: Boolean
-    startDate: String
-    endDate: String
+    startDate: Date
+    endDate: Date
     location: String
-    latitude: Float
-    longitude: Float
+    latitude: Latitude
+    longitude: Longitude
     allDay: Boolean
-    startTime: String
-    endTime: String
+    startTime: Time
+    endTime: Time
   }
 
   # input UpdateEventProjectInput {
@@ -254,13 +254,13 @@ export const inputs = gql`
   input UpdateTaskInput {
     title: String
     description: String
-    deadline: String
+    deadline: DateTime
   }
 
   input UpdateUserInput {
     firstName: String
     lastName: String
-    email: String
+    email: EmailAddress
   }
 
   input UpdateUserTypeInput {
@@ -276,7 +276,7 @@ export const inputs = gql`
   input UserInput {
     firstName: String!
     lastName: String!
-    email: String!
+    email: EmailAddress!
     password: String!
     appLanguageCode: String
     organizationUserBelongsToId: ID
@@ -304,12 +304,12 @@ export const inputs = gql`
     lastName_contains: String
     lastName_starts_with: String
 
-    email: String
-    email_not: String
-    email_in: [String!]
-    email_not_in: [String!]
-    email_contains: String
-    email_starts_with: String
+    email: EmailAddress
+    email_not: EmailAddress
+    email_in: [EmailAddress!]
+    email_not_in: [EmailAddress!]
+    email_contains: EmailAddress
+    email_starts_with: EmailAddress
 
     appLanguageCode: String
     appLanguageCode_not: String
@@ -325,7 +325,7 @@ export const inputs = gql`
   input PostUpdateInput {
     text: String
     title: String
-    imageUrl: String
-    videoUrl: String
+    imageUrl: URL
+    videoUrl: URL
   }
 `;

src/typeDefs/scalars.ts

@@ -2,5 +2,13 @@ import { gql } from "apollo-server-core";
 
 // Place fields alphabetically to ensure easier lookup and navigation.
 export const scalars = gql`
-  scalar Upload
+  scalar Date
+  scalar DateTime
+  scalar EmailAddress
+  scalar Latitude
+  scalar Longitude
+  scalar ID
+  scalar PhoneNumber
+  scalar Time
+  scalar URL
 `;