Merge pull request #7 from howtographql/chapter-9-finish

TasinIshmam · web-flow · commit bc662aa44827 · 2022-03-07T16:22:18.000+06:00
Add code for chapter 9
diff --git a/.env.example b/.env.example
@@ -0,0 +1,2 @@
+# rename file to .env 
+DATABASE_URL=postgres://postgres:postgres@localhost:5432/hackernews-db
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -0,0 +1,25 @@
+
+name: deploy-hackernews-app-heroku                       
+
+on:
+  push:
+    branches:                                            
+      - master
+      - main
+
+jobs:  
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2                        
+      - run: npm ci                                      
+      - name: Run production migration                   
+        run: npm run migrate:deploy                          
+        env:
+          DATABASE_URL: ${{ secrets.DATABASE_URL }}
+      - uses: akhileshns/heroku-deploy@v3.12.12          
+        with:
+          heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
+          heroku_app_name: ${{ secrets.HEROKU_APP_NAME }}
+          heroku_email: ${{ secrets.HEROKU_EMAIL }}
+  
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 node_modules
-# Keep environment variables out of version control
 .env
-.idea
 .vscode
-dist
+dist
+.idea 
diff --git a/README.md b/README.md
@@ -4,8 +4,12 @@ Tutorial for HowToGraphQL with Typescript, Apollo-Server, Nexus and Prisma.
 
 ### Installation
 
-1. Run `npm install`
-2. Run `npx prisma generate`
-3. Run `npm dev` 
+1. Install dependencies: `npm install`
+2. Start a PostgreSQL database with docker using: `docker-compose up -d`. 
+    - If you have a local instance of PostgreSQL running, you can skip this step. 
+3. Create a `.env` file and add the `DATABASE_URL` environment variable with a [PostgreSQL connection string](https://www.prisma.io/docs/concepts/database-connectors/postgresql#connection-details).
+    - The `.env.example` file is provided as reference. 
+4. Apply database migrations: `npx prisma migrate dev` 
+5. Start the project:  `npm dev` 
+
 
-_Note:_ There's no need to run migrations on the database because the SQLite Database is added to version control for convenience. 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,19 @@
+version: '3.8'
+services:
+
+  # Docker connection string for local machine: postgres://postgres:postgres@localhost:5432/
+
+  postgres:
+    image: postgres:13.5   
+    restart: always
+    environment:            
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+    volumes:                
+      - postgres:/var/lib/postgresql/data
+    ports:
+      - '5432:5432'         
+
+volumes:
+  postgres:
+  
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,10 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "ts-node-dev --transpile-only --no-notify --exit-child src/index.ts",
     "generate": "ts-node --transpile-only src/schema",
-    "prettier-format": "prettier 'src/**/*.ts' --write"
+    "prettier-format": "prettier 'src/**/*.ts' --write",
+        "migrate:deploy": "prisma migrate deploy",
+    "build": "prisma generate && npm run generate && tsc",
+    "start": "node dist/src/index.js"
   },
   "keywords": [],
   "author": "",
diff --git a/prisma/dev.db b/prisma/dev.db
diff --git a/prisma/migrations/20211116205624_init/migration.sql b/prisma/migrations/20211116205624_init/migration.sql
diff --git a/prisma/migrations/20211120093350_user/migration.sql b/prisma/migrations/20211120093350_user/migration.sql
diff --git a/prisma/migrations/20211214080826_add_vote_relation/migration.sql b/prisma/migrations/20211214080826_add_vote_relation/migration.sql
diff --git a/prisma/migrations/20220214215856_init/migration.sql b/prisma/migrations/20220214215856_init/migration.sql
@@ -0,0 +1,44 @@
+-- CreateTable
+CREATE TABLE "Link" (
+    "id" SERIAL NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "description" TEXT NOT NULL,
+    "url" TEXT NOT NULL,
+    "postedById" INTEGER,
+
+    CONSTRAINT "Link_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "User" (
+    "id" SERIAL NOT NULL,
+    "name" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "password" TEXT NOT NULL,
+
+    CONSTRAINT "User_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "_Votes" (
+    "A" INTEGER NOT NULL,
+    "B" INTEGER NOT NULL
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_Votes_AB_unique" ON "_Votes"("A", "B");
+
+-- CreateIndex
+CREATE INDEX "_Votes_B_index" ON "_Votes"("B");
+
+-- AddForeignKey
+ALTER TABLE "Link" ADD CONSTRAINT "Link_postedById_fkey" FOREIGN KEY ("postedById") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "_Votes" ADD FOREIGN KEY ("A") REFERENCES "Link"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "_Votes" ADD FOREIGN KEY ("B") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/migrations/migration_lock.toml b/prisma/migrations/migration_lock.toml
@@ -1,3 +1,3 @@
 # Please do not edit this file manually
 # It should be added in your version-control system (i.e. Git)
-provider = "sqlite"
+provider = "postgresql"
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -1,14 +1,14 @@
 datasource db {
-  provider = "sqlite"
-  url      = "file:./dev.db"
+  provider = "postgresql" 
+  url      = env("DATABASE_URL") 
 }
 
 generator client {
   provider = "prisma-client-js"
 }
 
 model Link {
-  id          Int      @id @default(autoincrement())
+  id          Int      @id @default(autoincrement()) 
   createdAt   DateTime @default(now())
   description String
   url         String
diff --git a/src/index.ts b/src/index.ts
@@ -1,15 +1,17 @@
 import { ApolloServer } from "apollo-server";
+import { ApolloServerPluginLandingPageLocalDefault } from "apollo-server-core";
 
 import { schema } from "./schema";
-
 import { context } from "./context";
 
 export const server = new ApolloServer({
     schema,
     context,
+    introspection: true,
+    plugins: [ApolloServerPluginLandingPageLocalDefault()],
 });
 
-const port = 3000;
+const port = process.env.PORT || 3000;
 
 server.listen({ port }).then(({ url }) => {
     console.log(`🚀  Server  ready at ${url}`);
diff --git a/src/schema.ts b/src/schema.ts
@@ -2,7 +2,6 @@ import { makeSchema } from "nexus";
 import { join } from "path";
 import * as types from "./graphql";
 
-
 export const schema = makeSchema({
     types,
     outputs: {
@@ -13,4 +12,4 @@ export const schema = makeSchema({
         module: join(process.cwd(), "./src/context.ts"),
         export: "Context",
     },
-});
+});

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# rename file to .env`
	`2`	`+DATABASE_URL=postgres://postgres:postgres@localhost:5432/hackernews-db`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,5 @@ @@
 node_modules
 -# Keep environment variables out of version control
 .env
 -.idea
 .vscode
 -dist
 +dist
 +.idea