Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .env
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Defaults
DATABASE_HOST=localhost
DATABASE_PORT=5432
DATABASE_USERNAME=docker
DATABASE_PASSWORD=docker
DATABASE_PORT=5433
DATABASE_USERNAME=permacoop
DATABASE_PASSWORD=permacoop
DATABASE_NAME=permacoop
CALENDAR_TOKEN='abcd1234'
SESSION_SECRET=changeme
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ Then, you can seed the database with fake data
make database-seed
```

This command will create the default user "John Doe" :
This command will create the following seed accounts:

```json
{
"email": "john@doe.com",
"password": "john"
}
```
| Name | Email | Password | Role |
|------|-------|----------|------|
| John Doe | john@doe.com | john | COOPERATOR |
| Jane Smith | jane@smith.com | john | COOPERATOR |

4 additional users are also created with random emails (generated by faker) — they all share the same password: `john`.

The server will be available at <http://localhost:3000>.

Expand Down
15 changes: 10 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@ services:
database:
image: postgres:12
environment:
POSTGRES_USER: docker
POSTGRES_PASSWORD: docker
POSTGRES_USER: permacoop
POSTGRES_PASSWORD: permacoop
POSTGRES_DB: permacoop
PGUSER: docker
PGPASSWORD: docker
PGUSER: permacoop
PGPASSWORD: permacoop
volumes:
- 'database:/var/lib/postgresql/data'
ports:
- 5432:5432
- 5433:5432
healthcheck:
test: ["CMD-SHELL", "pg_isready -U permacoop"]
interval: 5s
timeout: 5s
retries: 5
6 changes: 6 additions & 0 deletions init-db.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
set -e

psql -v ON_ERROR_STOP=1 --username "docker" --dbname "permacoop" <<-EOSQL
CREATE ROLE permacoop WITH LOGIN PASSWORD 'permacoop' CREATEDB;
EOSQL
31 changes: 31 additions & 0 deletions migrations/1743667200000-addMenstrualLeave.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class AddMenstrualLeave1743667200000 implements MigrationInterface {
name = 'AddMenstrualLeave1743667200000';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TYPE "public"."leave_request_type_enum" RENAME TO "leave_request_type_enum_old"`
);
await queryRunner.query(
`CREATE TYPE "public"."leave_request_type_enum" AS ENUM('paid', 'unpaid', 'special', 'medical', 'illimited', 'postponedWorkedFreeDay', 'relocation', 'menstrual')`
);
await queryRunner.query(
`ALTER TABLE "leave_request" ALTER COLUMN "type" TYPE "public"."leave_request_type_enum" USING "type"::"text"::"public"."leave_request_type_enum"`
);
await queryRunner.query(`DROP TYPE "public"."leave_request_type_enum_old"`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`CREATE TYPE "public"."leave_request_type_enum_old" AS ENUM('paid', 'unpaid', 'special', 'medical', 'illimited', 'postponedWorkedFreeDay', 'relocation')`
);
await queryRunner.query(
`ALTER TABLE "leave_request" ALTER COLUMN "type" TYPE "public"."leave_request_type_enum_old" USING "type"::"text"::"public"."leave_request_type_enum_old"`
);
await queryRunner.query(`DROP TYPE "public"."leave_request_type_enum"`);
await queryRunner.query(
`ALTER TYPE "public"."leave_request_type_enum_old" RENAME TO "leave_request_type_enum"`
);
}
}
Loading
Loading