Refacto/wild 017 paginer urls

.env.sample

@@ -8,4 +8,8 @@ POSTGRES_HOST=
 POSTGRES_PORT=
 POSTGRES_USER=
 POSTGRES_DB=
-POSTGRES_PASSWORD=
+POSTGRES_PASSWORD=
+
+JWT_SECRET_KEY=
+
+COOKIE_TTL=

.github/workflows/Backend-Static.yml

@@ -0,0 +1,46 @@
+name: Backend CI
+
+on:
+  push:
+    paths:
+    - 'back/**'
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Use Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: 20
+
+    - name: Install dependencies
+      run: npm install
+      working-directory: back
+
+    - name: Check formatting
+      run: npx prettier .
+      working-directory: back
+
+  lint:
+    needs: format
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Use Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: 20
+
+    - name: Install dependencies
+      run: npm install
+      working-directory: back
+
+    - name: Lint
+      run: npm run lint
+      working-directory: back

.github/workflows/Frontend-Static.yml

@@ -0,0 +1,46 @@
+name: Frontend CI
+
+on:
+  push:
+    paths:
+    - 'front/**'
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Use Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: 20
+
+    - name: Install dependencies
+      run: npm install
+      working-directory: front
+
+    - name: Check formatting
+      run: npx prettier .
+      working-directory: front
+
+  lint:
+    needs: format
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Use Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: 20
+
+    - name: Install dependencies
+      run: npm install
+      working-directory: front
+
+    - name: Lint
+      run: npm run lint
+      working-directory: front

.github/workflows/test-ci.yml

@@ -0,0 +1,28 @@
+name: test-ci
+
+
+on: 
+  pull_request:
+    paths-ignore:
+      - 'data/**'
+      - 'front/src/generated/**'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Build and test
+        run: docker compose -f docker-compose.test.yaml up --abort-on-container-exit
+        env:
+          APP_ENV: ${{ secrets.APP_ENV }}
+          VITE_API_URL: ${{ secrets.VITE_API_URL }}
+          BACKEND_PORT: ${{ secrets.BACKEND_PORT }}
+          POSTGRES_HOST: ${{ secrets.POSTGRES_HOST }}
+          POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }}
+          POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
+          POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
+          POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+          JWT_SECRET_KEY: ${{ secrets.JWT_SECRET_KEY }}
+          COOKIE_TTL: ${{ secrets.COOKIE_TTL }}

Makefile

@@ -1,3 +1,15 @@
+OS := $(shell uname -s)
+
+ifeq ($(OS), Linux)
+    RM = sudo rm -rf
+else ifeq ($(OS), Darwin) # macOS
+    RM = sudo rm -rf
+else ifeq ($(OS), Windows_NT)
+    RM = rmdir /s /q
+else
+    RM = echo "Unsupported OS"
+endif
+
 build-dev:
 	docker compose -f docker-compose.dev.yaml up --build
 
@@ -11,4 +23,18 @@ build-prod:
 	docker compose -f docker-compose.yaml up --build
 
 run-prod:
-	docker compose -f docker-compose.yaml up
+	docker compose -f docker-compose.yaml up
+
+# Après la commande, ajouter name=(NomDeLaMigration)
+generate-migration:
+	docker exec -it backend npm run migration:generate -- src/database/migrations/$(name)
+
+populate-db:
+	docker exec -it backend npm run populate-db
+
+clean-dev:
+	docker compose -f docker-compose.dev.yaml down
+	docker rm -f $(shell docker ps -a -q) 2> /dev/null || true
+	docker volume rm $(shell docker volume ls -q) 2> /dev/null || true
+	$(RM) data
+	docker system prune -f

back/.eslintrc.js

@@ -20,4 +20,9 @@ module.exports = {
     rules: {
         // Vous pouvez ajouter ou modifier des règles spécifiques ici
     },
+    overrides: [
+        {
+            files: ["*.ts"],
+        },
+    ],
 };

back/package.json

@@ -5,42 +5,48 @@
     "main": "src/index.ts",
     "scripts": {
         "test": "jest",
-        "lint": "npx eslint --ext .ts src",
+        "lint": "npx eslint src",
         "dev": "ts-node-dev --poll src/index.ts",
-        "seed": "ts-node-dev src/database/seeder/fixtures.ts"
+        "seed": "ts-node-dev src/database/seeder/fixtures.ts",
+        "populate-db": "ts-node src/database/scripts/PopulateDB.ts",
+        "migration:create": "typeorm-ts-node-commonjs migration:create",
+        "migration:generate": "typeorm-ts-node-commonjs migration:generate -d src/database/dataSource.ts",
+        "migration:up": "typeorm-ts-node-commonjs migration:run -d src/database/dataSource.ts",
+        "migration:down": "typeorm-ts-node-commonjs migration:revert -d src/database/dataSource.ts"
     },
     "keywords": [],
     "author": "",
     "license": "ISC",
     "dependencies": {
         "@apollo/server": "4.10.4",
         "argon2": "0.40.3",
-        "axios": "^1.7.2",
-        "class-validator": "^0.14.1",
+        "axios": "1.7.2",
+        "class-validator": "0.14.1",
         "cors": "2.8.5",
         "dotenv": "16.4.5",
         "express": "4.19.2",
         "graphql": "16.8.2",
         "graphql-scalars": "1.23.0",
         "jsonwebtoken": "9.0.2",
-        "pg": "^8.12.0",
+        "pg": "8.12.0",
         "reflect-metadata": "0.2.2",
         "type-graphql": "2.0.0-rc.1",
         "typeorm": "0.3.20"
     },
     "devDependencies": {
         "@types/cors": "2.8.17",
         "@types/express": "4.17.21",
-        "@types/jest": "^29.5.12",
+        "@types/jest": "29.5.12",
         "@types/jsonwebtoken": "9.0.6",
         "@types/node": "20.14.9",
-        "@types/supertest": "^6.0.2",
-        "@typescript-eslint/eslint-plugin": "^7.15.0",
-        "eslint": "8.56.0",
+        "@types/supertest": "6.0.2",
+        "@typescript-eslint/eslint-plugin": "7.15.0",
+        "eslint": "8.57.0",
         "globals": "15.8.0",
-        "jest": "^29.7.0",
-        "supertest": "^7.0.0",
-        "ts-jest": "^29.2.0",
+        "jest": "29.7.0",
+        "prettier": "3.3.2",
+        "supertest": "7.0.0",
+        "ts-jest": "29.2.0",
         "ts-node-dev": "2.0.0"
     }
 }

back/src/__tests__/Url.test.ts

@@ -1,5 +1,6 @@
 import dataSource from "../database/dataSource";
 import { Url } from "../entities/Url";
+import { ILike } from "typeorm";
 
 describe("Integration Test Url Entity", () => {
     beforeAll(async () => {
@@ -10,7 +11,24 @@ describe("Integration Test Url Entity", () => {
     });
 
     it("find method should return a list of Url", async () => {
-        const urls = await Url.find();
+        const urls = await Url.find({
+            order: { createdAt: "DESC" },
+        });
+
+        // Check if the result is an array
+        expect(Array.isArray(urls)).toBeTruthy();
+
+        // Check if values are instances of Url
+        urls.forEach((url) => {
+            expect(url).toBeInstanceOf(Url);
+        });
+    });
+
+    it("find with where method and order should return a list of Url in clause", async () => {
+        const urls = await Url.find({
+            where: [{ name: ILike(`%Fa%`) }, { path: ILike(`%Fa%`) }],
+            order: { createdAt: "DESC" },
+        });
 
         // Check if the result is an array
         expect(Array.isArray(urls)).toBeTruthy();

back/src/database/dataSource.ts

@@ -2,6 +2,10 @@ import { DataSource } from "typeorm";
 import { Url } from "../entities/Url";
 import { History } from "../entities/History";
 import { UrlSubscriber } from "../subscribers/UrlSubscribers";
+import { User } from "../entities/User";
+import { InitDbUrlHistoryUser1720618090787 } from "./migrations/1720618090787-Init_db_Url_History_User";
+import { AddUserUrl1720710308167 } from "./migrations/1720710308167-Add-UserUrl";
+import { UserUrl } from "../entities/UserUrl";
 
 const dataSource = new DataSource({
     type: "postgres",
@@ -10,10 +14,11 @@ const dataSource = new DataSource({
     username: process.env.POSTGRES_USER,
     password: process.env.POSTGRES_PASSWORD,
     database: process.env.POSTGRES_DB,
-    synchronize: true,
+    synchronize: process.env.APP_ENV === "test",
     logging: process.env.APP_ENV === "dev",
-    entities: [Url, History],
+    entities: [Url, History, User, UserUrl],
     subscribers: [UrlSubscriber],
+    migrations: [InitDbUrlHistoryUser1720618090787, AddUserUrl1720710308167],
 });
 
 export default dataSource;

back/src/database/migrations/1720618090787-Init_db_Url_History_User.ts

@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class InitDbUrlHistoryUser1720618090787 implements MigrationInterface {
+    name = "InitDbUrlHistoryUser1720618090787";
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(
+            `CREATE TABLE "history" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "created_at" TIMESTAMP NOT NULL DEFAULT now(), "status_code" integer NOT NULL, "response" text NOT NULL, "urlId" uuid, CONSTRAINT "PK_9384942edf4804b38ca0ee51416" PRIMARY KEY ("id"))`,
+        );
+        await queryRunner.query(
+            `CREATE TABLE "url" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "name" character varying(55) NOT NULL, "path" character varying NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_7421088122ee64b55556dfc3a91" PRIMARY KEY ("id"))`,
+        );
+        await queryRunner.query(
+            `CREATE TABLE "user" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "username" character varying NOT NULL, "email" character varying NOT NULL, "hashedPassword" character varying NOT NULL, CONSTRAINT "UQ_78a916df40e02a9deb1c4b75edb" UNIQUE ("username"), CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"), CONSTRAINT "PK_cace4a159ff9f2512dd42373760" PRIMARY KEY ("id"))`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "history" ADD CONSTRAINT "FK_9b8293dadd944e8ad0dc4e8ecaa" FOREIGN KEY ("urlId") REFERENCES "url"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+        );
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(
+            `ALTER TABLE "history" DROP CONSTRAINT "FK_9b8293dadd944e8ad0dc4e8ecaa"`,
+        );
+        await queryRunner.query(`DROP TABLE "user"`);
+        await queryRunner.query(`DROP TABLE "url"`);
+        await queryRunner.query(`DROP TABLE "history"`);
+    }
+}

back/src/database/migrations/1720710308167-Add-UserUrl.ts

@@ -0,0 +1,27 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddUserUrl1720710308167 implements MigrationInterface {
+    name = "AddUserUrl1720710308167";
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(
+            `CREATE TABLE "user_url" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "userId" uuid NOT NULL, "urlId" uuid NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "REL_2d3c4059016f20361da982c5d9" UNIQUE ("urlId"), CONSTRAINT "PK_8644584d3620c8fd95111270b75" PRIMARY KEY ("id"))`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "user_url" ADD CONSTRAINT "FK_44c91da328f0e8292edb2c7ed73" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "user_url" ADD CONSTRAINT "FK_2d3c4059016f20361da982c5d9d" FOREIGN KEY ("urlId") REFERENCES "url"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+        );
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(
+            `ALTER TABLE "user_url" DROP CONSTRAINT "FK_2d3c4059016f20361da982c5d9d"`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "user_url" DROP CONSTRAINT "FK_44c91da328f0e8292edb2c7ed73"`,
+        );
+        await queryRunner.query(`DROP TABLE "user_url"`);
+    }
+}