Add typeorm and a User model

docker-compose.yml

@@ -26,3 +26,17 @@ services:
       - ./src/:/nest/src/
     entrypoint: yarn
     command: start:dev
+
+  app-backend-yarn:
+    build:
+      context: ./
+      dockerfile: Dockerfile
+    env_file: .env
+    depends_on:
+      database:
+        condition: service_healthy
+    links:
+      - database:database.service.districtbuilder.internal
+    volumes:
+      - ./src/:/nest/src/
+    entrypoint: yarn

scripts/migrate

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+function usage() {
+    echo -n \
+        "Usage: $(basename "$0") [migration_name]
+Run migrations using typeorm.
+"
+}
+
+if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
+    if [ "${1:-}" = "--help" ]; then
+        usage
+    else
+        docker-compose up -d \
+            database app-backend-yarn
+
+        docker-compose \
+            run --rm app-backend-yarn "migration:run"
+    fi
+fi

scripts/migration_generate

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+function usage() {
+    echo -n \
+        "Usage: $(basename "$0") [migration_name]
+Generates a migration using typeorm.
+"
+}
+
+if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
+    if [ "${1:-}" = "--help" ]; then
+        usage
+    else
+        docker-compose up -d \
+            database app-backend-yarn
+
+        docker-compose \
+            run --rm app-backend-yarn "migration:generate" "$@"
+    fi
+fi

src/server/migrations/1580263521268-CreateUserTable.ts

@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class CreateUserTable1580263521268 implements MigrationInterface {
+    readonly name = 'CreateUserTable1580263521268'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TABLE "user" ("id" SERIAL NOT NULL, "email" character varying NOT NULL, CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"), CONSTRAINT "PK_cace4a159ff9f2512dd42373760" PRIMARY KEY ("id"))`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`DROP TABLE "user"`, undefined);
+    }
+
+}

src/server/ormconfig.js

@@ -0,0 +1,22 @@
+const process = require('process');
+const username = process.env.POSTGRES_USER;
+const password = process.env.POSTGRES_PASSWORD;
+module.exports = {
+  "type": "postgres",
+  "host": "database.service.districtbuilder.internal",
+  "port": 5432,
+  username,
+  password,
+  "database": "postgres",
+  "synchronize": true,
+  "dropSchema": false,
+  "logging": true,
+  "entities": [__dirname + "/src/**/*.entity.ts", __dirname + "/dist/**/*.entity.js"],
+  "migrations": ["migrations/**/*.ts"],
+  "subscribers": ["subscriber/**/*.ts", "dist/subscriber/**/.js"],
+  "cli": {
+    "entitiesDir": "src",
+    "migrationsDir": "migrations",
+    "subscribersDir": "subscriber"
+  }
+}

src/server/package.json

@@ -11,18 +11,30 @@
     "start:debug": "nest start --debug --watch",
     "start:prod": "node dist/server/src/main",
     "lint": "tslint -p tsconfig.json -c tslint.json",
+    "fix": "tslint -p tsconfig.json -c tslint.json --fix",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
-    "test:e2e": "jest --config ./test/jest-e2e.json"
+    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js",
+    "migration:generate": "yarn run typeorm migration:generate -n",
+    "migration:create": "yarn run typeorm migration:create -n",
+    "migration:run": "yarn run typeorm migration:run"
   },
   "dependencies": {
     "@nestjs/common": "^6.10.14",
     "@nestjs/core": "^6.10.14",
     "@nestjs/platform-express": "^6.10.14",
+    "@nestjs/typeorm": "^6.2.0",
+    "@nestjsx/crud": "^4.4.1",
+    "@nestjsx/crud-typeorm": "^4.4.1",
+    "class-transformer": "^0.2.3",
+    "class-validator": "^0.11.0",
+    "pg": "^7.17.1",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.0",
-    "rxjs": "^6.5.4"
+    "rxjs": "^6.5.4",
+    "typeorm": "^0.2.22"
   },
   "devDependencies": {
     "@nestjs/cli": "^6.13.2",

src/server/src/app.module.ts

@@ -1,9 +1,25 @@
 import { Module } from "@nestjs/common";
+import { TypeOrmModule } from "@nestjs/typeorm";
+import * as process from "process";
 import { AppController } from "./app.controller";
 import { AppService } from "./app.service";
-
+import { UsersModule } from "./users/users.module";
+const username = process.env.POSTGRES_USER;
+const password = process.env.POSTGRES_PASSWORD;
 @Module({
-  imports: [],
+  imports: [
+    TypeOrmModule.forRoot({
+      type: "postgres",
+      host: "database.service.districtbuilder.internal",
+      port: 5432,
+      username,
+      password,
+      database: "postgres",
+      entities: [__dirname + "/**/*.entity{.ts,.js}"],
+      synchronize: true
+    }),
+    UsersModule
+  ],
   controllers: [AppController],
   providers: [AppService]
 })

src/server/src/users/controllers/users/users.controller.spec.ts

@@ -0,0 +1,18 @@
+import { Test, TestingModule } from "@nestjs/testing";
+import { UsersController } from "./users.controller";
+
+describe("Users Controller", () => {
+  let controller: UsersController;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      controllers: [UsersController]
+    }).compile();
+
+    controller = module.get<UsersController>(UsersController);
+  });
+
+  it("should be defined", () => {
+    expect(controller).toBeDefined();
+  });
+});

src/server/src/users/controllers/users/users.controller.ts

@@ -0,0 +1,14 @@
+import { Controller } from "@nestjs/common";
+import { Crud, CrudController } from "@nestjsx/crud";
+import { User } from "../../entities/user.entity";
+import { UsersService } from "../../services/users/users.service";
+
+@Crud({
+  model: {
+    type: User
+  }
+})
+@Controller("users")
+export class UsersController implements CrudController<User> {
+  constructor(public service: UsersService) {}
+}

src/server/src/users/entities/user.entity.ts

@@ -0,0 +1,8 @@
+import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
+@Entity()
+export class User {
+  @PrimaryGeneratedColumn()
+  readonly id: string;
+  @Column({ unique: true })
+  readonly email: string;
+}

src/server/src/users/services/users/users.service.spec.ts

@@ -0,0 +1,18 @@
+import { Test, TestingModule } from "@nestjs/testing";
+import { UsersService } from "./users.service";
+
+describe("UsersService", () => {
+  let service: UsersService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [UsersService]
+    }).compile();
+
+    service = module.get<UsersService>(UsersService);
+  });
+
+  it("should be defined", () => {
+    expect(service).toBeDefined();
+  });
+});

src/server/src/users/services/users/users.service.ts

@@ -0,0 +1,12 @@
+import { Injectable } from "@nestjs/common";
+import { InjectRepository } from "@nestjs/typeorm";
+import { TypeOrmCrudService } from "@nestjsx/crud-typeorm";
+import { Repository } from "typeorm";
+import { User } from "../../entities/user.entity";
+
+@Injectable()
+export class UsersService extends TypeOrmCrudService<User> {
+  constructor(@InjectRepository(User) usersRepository: Repository<User>) {
+    super(usersRepository);
+  }
+}

src/server/src/users/users.module.ts

@@ -0,0 +1,11 @@
+import { Module } from "@nestjs/common";
+import { TypeOrmModule } from "@nestjs/typeorm";
+import { UsersController } from "./controllers/users/users.controller";
+import { User } from "./entities/user.entity";
+import { UsersService } from "./services/users/users.service";
+@Module({
+  imports: [TypeOrmModule.forFeature([User])],
+  controllers: [UsersController],
+  providers: [UsersService]
+})
+export class UsersModule {}