diff --git a/.gitignore b/.gitignore index 7e8ec09..a1c0e16 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ .env.local +*.gen.ts + npm-debug.log* yarn-debug.log* yarn-error.log* \ No newline at end of file diff --git a/codegen.yml b/codegen.yml new file mode 100644 index 0000000..8bb9da1 --- /dev/null +++ b/codegen.yml @@ -0,0 +1,12 @@ +overwrite: true +schema: "src/typeDefs/typeDefs.gql" +documents: null +generates: + src/typeDefs/typeDefs.gen.ts: + config: + useIndexSignature: true + wrapFieldDefinitions: true + enumsAsTypes: true + plugins: + - "typescript" + - "typescript-resolvers" diff --git a/nodemon.json b/nodemon.json new file mode 100644 index 0000000..e7690ad --- /dev/null +++ b/nodemon.json @@ -0,0 +1,6 @@ +{ + "ignore": ["**/*.test.ts", "**/*.spec.ts", "node_modules"], + "watch": ["src"], + "exec": "yarn start", + "ext": "ts" +} \ No newline at end of file diff --git a/package.json b/package.json index a09e584..53ae578 100644 --- a/package.json +++ b/package.json @@ -9,14 +9,20 @@ "apollo-server": "^2.18.2", "graphql": "^15.3.0", "jsonwebtoken": "^8.5.1", - "jwks-rsa": "^1.10.1" + "jwks-rsa": "^1.10.1", + "nodemon": "^2.0.4" }, "scripts": { - "dev": "ts-node-dev src/index.ts" + "dev": "nodemon", + "start": "ts-node src/index.ts", + "codegen": "graphql-codegen --config codegen.yml" }, "devDependencies": { + "@graphql-codegen/cli": "1.17.10", + "@graphql-codegen/introspection": "1.18.0", + "@graphql-codegen/typescript": "1.17.10", + "@graphql-codegen/typescript-resolvers": "1.17.10", "ts-node": "^9.0.0", - "ts-node-dev": "^1.0.0-pre.63", "typescript": "^4.0.3" } } diff --git a/prisma/migrations/20201007134933-fix-optional-values/README.md b/prisma/migrations/20201007134933-fix-optional-values/README.md new file mode 100644 index 0000000..76726fd --- /dev/null +++ b/prisma/migrations/20201007134933-fix-optional-values/README.md @@ -0,0 +1,42 @@ +# Migration `20201007134933-fix-optional-values` + +This migration has been generated by Dm1tr1y147 at 10/7/2020, 6:49:33 PM. +You can check out the [state of the schema](./schema.prisma) after the migration. + +## Database Steps + +```sql +ALTER TABLE "public"."Answer" ALTER COLUMN "userInput" DROP NOT NULL, +ALTER COLUMN "userChoise" DROP NOT NULL +``` + +## Changes + +```diff +diff --git schema.prisma schema.prisma +migration 20201006185953-improved-schema-structure..20201007134933-fix-optional-values +--- datamodel.dml ++++ datamodel.dml +@@ -2,9 +2,9 @@ + // learn more about it in the docs: https://pris.ly/d/prisma-schema + datasource db { + provider = "postgres" +- url = "***" ++ url = "***" + } + generator client { + provider = "prisma-client-js" +@@ -75,10 +75,10 @@ + formId Int? + } + model Answer { +- userInput String +- userChoise Int ++ userInput String? ++ userChoise Int? + type AnswerType + id Int @id @default(autoincrement()) + FormSubmission FormSubmission? @relation(fields: [formSubmissionId], references: [id]) +``` + + diff --git a/prisma/migrations/20201007134933-fix-optional-values/schema.prisma b/prisma/migrations/20201007134933-fix-optional-values/schema.prisma new file mode 100644 index 0000000..9b51a29 --- /dev/null +++ b/prisma/migrations/20201007134933-fix-optional-values/schema.prisma @@ -0,0 +1,91 @@ +// This is your Prisma schema file, +// learn more about it in the docs: https://pris.ly/d/prisma-schema + +datasource db { + provider = "postgres" + url = "***" +} + +generator client { + provider = "prisma-client-js" +} + +model Form { + title String + choisesQuestions ChoisesQuestion[] + inputQuestions InputQuestion[] + submissions FormSubmission[] + dateCreated DateTime @default(now()) + author User @relation(fields: [userId], references: [id]) + + id Int @id @default(autoincrement()) + userId Int +} + +model ChoisesQuestion { + title String + variants Variant[] + type ChoiseType + number Int + + id Int @id @default(autoincrement()) + Form Form? @relation(fields: [formId], references: [id]) + formId Int? +} + +model Variant { + text String + + id Int @id @default(autoincrement()) + ChoisesQuestion ChoisesQuestion? @relation(fields: [choisesQuestionId], references: [id]) + choisesQuestionId Int? +} + +model InputQuestion { + title String + number Int + + id Int @id @default(autoincrement()) + Form Form? @relation(fields: [formId], references: [id]) + formId Int? +} + +enum ChoiseType { + SELECT + CHECK + CHOOSE +} + +model User { + name String + forms Form[] + + id Int @id @default(autoincrement()) + formsSubmissions FormSubmission[] +} + +model FormSubmission { + answers Answer[] + date DateTime @default(now()) + user User @relation(fields: [userId], references: [id]) + + id Int @id @default(autoincrement()) + userId Int + Form Form? @relation(fields: [formId], references: [id]) + formId Int? +} + +model Answer { + userInput String? + userChoise Int? + type AnswerType + + id Int @id @default(autoincrement()) + FormSubmission FormSubmission? @relation(fields: [formSubmissionId], references: [id]) + formSubmissionId Int? +} + +enum AnswerType { + INPUT + CHOISE +} diff --git a/prisma/migrations/20201007134933-fix-optional-values/steps.json b/prisma/migrations/20201007134933-fix-optional-values/steps.json new file mode 100644 index 0000000..729459e --- /dev/null +++ b/prisma/migrations/20201007134933-fix-optional-values/steps.json @@ -0,0 +1,17 @@ +{ + "version": "0.3.14-fixed", + "steps": [ + { + "tag": "UpdateField", + "model": "Answer", + "field": "userInput", + "arity": "Optional" + }, + { + "tag": "UpdateField", + "model": "Answer", + "field": "userChoise", + "arity": "Optional" + } + ] +} \ No newline at end of file diff --git a/prisma/migrations/migrate.lock b/prisma/migrations/migrate.lock index c1de62a..cf44e12 100644 --- a/prisma/migrations/migrate.lock +++ b/prisma/migrations/migrate.lock @@ -1,4 +1,5 @@ # Prisma Migrate lockfile v1 20201006125838-initial-migration -20201006185953-improved-schema-structure \ No newline at end of file +20201006185953-improved-schema-structure +20201007134933-fix-optional-values \ No newline at end of file diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 841fd90..e721dce 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -76,8 +76,8 @@ model FormSubmission { } model Answer { - userInput String - userChoise Int + userInput String? + userChoise Int? type AnswerType id Int @id @default(autoincrement()) diff --git a/src/db/index.ts b/src/db/index.ts new file mode 100644 index 0000000..57f8ca6 --- /dev/null +++ b/src/db/index.ts @@ -0,0 +1,24 @@ +import { PrismaClient } from "@prisma/client" + +const getForm = async (db: PrismaClient, id: number) => + db.form.findOne({ + where: { + id: id, + }, + include: { + author: true, + choisesQuestions: { + include: { + variants: true, + }, + }, + inputQuestions: true, + submissions: { + include: { + answers: true, + }, + }, + }, + }) + +export { getForm } diff --git a/src/index.ts b/src/index.ts index e69de29..3f690eb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -0,0 +1,18 @@ +import { ApolloServer } from "apollo-server" + +import typeDefs from "./typeDefs" +import resolvers from "./resolvers" +import { PrismaClient } from "@prisma/client" + +const server = new ApolloServer({ + typeDefs, + resolvers, + context: async () => { + const db = new PrismaClient() + return { db } + }, +}) + +server.listen().then(({ url }) => { + console.log(`Server ready at ${url}`) +}) diff --git a/src/list.test.json b/src/list.test.json deleted file mode 100644 index 5c1503f..0000000 --- a/src/list.test.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - { - - } -] \ No newline at end of file diff --git a/src/resolvers/Form.ts b/src/resolvers/Form.ts new file mode 100644 index 0000000..21d8e8f --- /dev/null +++ b/src/resolvers/Form.ts @@ -0,0 +1,60 @@ +import { getForm } from "../db" +import { + Form, + FormSubmission, + QueryFormArgs, + QuestionResolvers, + Resolver, + AnswerResolvers, +} from "../typeDefs/typeDefs.gen" +import { ApolloContextType } from "../types" + +const formQuery: Resolver = async ( + _, + { id }, + { db } +) => { + try { + const dbForm = await getForm(db, id) + + if (dbForm == null) throw new Error("Not found") + + const form: Form = { + id: dbForm.id, + title: dbForm.title, + questions: [...dbForm.choisesQuestions, ...dbForm.inputQuestions], + dateCreated: dbForm.dateCreated.toString(), + submissions: dbForm.submissions.map((submission) => { + return { + answers: submission.answers, + date: submission.date.toString(), + id: submission.id, + } + }), + } + + return form + } catch (err) { + return err + } +} + +const QuestionResolver: QuestionResolvers = { + __resolveType(obj: any, context, info) { + if (obj.type) { + return "ChoisesQuestion" + } + return "InputQuestion" + }, +} + +const AnswerResolver: AnswerResolvers = { + __resolveType(obj, context, info) { + if (obj.type == "CHOISE") return "ChoiseAnswer" + if (obj.type == "INPUT") return "InputAnswer" + + return null + }, +} + +export { formQuery, QuestionResolver, AnswerResolver } diff --git a/src/resolvers/User.ts b/src/resolvers/User.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/resolvers/index.ts b/src/resolvers/index.ts new file mode 100644 index 0000000..26cae5f --- /dev/null +++ b/src/resolvers/index.ts @@ -0,0 +1,17 @@ +import { ApolloContextType } from "../types" +import { Resolvers } from "../typeDefs/typeDefs.gen" +import { + formQuery as form, + QuestionResolver as Question, + AnswerResolver as Answer, +} from "./Form" + +const resolvers: Resolvers = { + Query: { + form, + }, + Question, + Answer, +} + +export default resolvers diff --git a/src/typeDefs/index.ts b/src/typeDefs/index.ts new file mode 100644 index 0000000..ef9dbb9 --- /dev/null +++ b/src/typeDefs/index.ts @@ -0,0 +1,8 @@ +import { gql } from "apollo-server" +import fs from "fs" + +const typeDefs = gql( + fs.readFileSync(__dirname.concat("/typeDefs.gql"), { encoding: "utf-8" }) +) + +export default typeDefs diff --git a/src/typeDefs.graphql b/src/typeDefs/typeDefs.gql similarity index 52% rename from src/typeDefs.graphql rename to src/typeDefs/typeDefs.gql index 5ab1fed..f737231 100644 --- a/src/typeDefs.graphql +++ b/src/typeDefs/typeDefs.gql @@ -1,20 +1,23 @@ type Query { - forms: [Form] - form(id: Int!): Form! + forms: [Form!]! + form(id: Int!): Form } type Form { id: Int! title: String! - choisesQuestions: [ChoisesQuestion!]! - inputQuestions: [InputQuestion!]! + questions: [Question!]! submissions: [FormSubmission!]! dateCreated: String! } - -type ChoisesQuestion { +interface Question { title: String! - variants: [Variant!]! + number: Int! +} + +type ChoisesQuestion implements Question { + title: String! + variants: [Variant!] type: ChoiseType! number: Int! } @@ -23,7 +26,7 @@ type Variant { text: String! } -type InputQuestion { +type InputQuestion implements Question { title: String! number: Int! } @@ -34,13 +37,23 @@ type FormSubmission { date: String! } -type Answer { +interface Answer { id: Int! - userInput: String - userChoise: Int type: AnswerType! } +type InputAnswer implements Answer { + id: Int! + type: AnswerType! + userInput: String +} + +type ChoiseAnswer implements Answer { + id: Int! + type: AnswerType! + userChoise: Int! +} + enum ChoiseType { SELECT CHECK diff --git a/src/types.ts b/src/types.ts new file mode 100644 index 0000000..1749fbd --- /dev/null +++ b/src/types.ts @@ -0,0 +1,5 @@ +import { PrismaClient } from "@prisma/client" + +export type ApolloContextType = { + db: PrismaClient +}