Merge pull request #31 from itk-dev/feature/cleanup

Cleanup

Author: rimi-itk

.env

@@ -15,8 +15,7 @@ APP_SECRET=
 # DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4"
 # DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
 # DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
-# DATABASE_URL="mysql://db:db@mariadb:3306/db?serverVersion=10.11.14-MariaDB&charset=utf8"
-DATABASE_URL="sqlite:///%kernel.project_dir%/var/app.db"
+DATABASE_URL="mysql://db:db@mariadb:3306/db?serverVersion=10.11.14-MariaDB&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/mercure-bundle ###
@@ -51,7 +50,8 @@ ADMIN_OIDC_CLIENT_SECRET=client-secret
 ADMIN_OIDC_REDIRECT_URI=https://rpa-process-overview.local.itkdev.dk/
 ADMIN_OIDC_LEEWAY=30
 ADMIN_OIDC_ROLE_MAP='{
-  "overview-manager": ["ROLE_OVERVIEW_MANAGER"]
+  "overview-manager": ["ROLE_OVERVIEW_MANAGER"],
+  "admin": ["ROLE_ADMIN"]
 }'
 
 # cli redirect url

.gitignore

@@ -26,6 +26,7 @@
 ###< symfony/asset-mapper ###
 
 *.local
+*.local.yml
 .idea
 
 # Generated widget code

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* [PR-31](https://github.com/itk-dev/rpa-process-overview/pull/31)
+  * Used Mysql database.
+  * Cleaned up entities.
 * [PR-30](https://github.com/itk-dev/rpa-process-overview/pull/30)
   Add pagination
 * [PR-27](https://github.com/itk-dev/rpa-process-overview/pull/27)

README.md

@@ -30,7 +30,7 @@ task site:update
 
 > [!NOTE]
 > Running `task site:update` on [macOS (darwin)](https://en.wikipedia.org/wiki/Darwin_(operating_system)) will pull and
-> patch the API Git submodule (cf. [#api](API)). See [`Taskfile.yml`](Taskfile.yml) for details.
+> patch the API Git submodule (cf. [API](#api)). See [`Taskfile.yml`](Taskfile.yml) for details.
 
 Load fixtures with
 

Taskfile.yml

@@ -38,19 +38,30 @@ tasks:
         vars:
           TASK_ARGS: pull
 
-      # Additional setup for local development (assuming we're running on maxOS (darwin))
+      # Additional setup if API service is enabled.
       - cmd: |
-          git -C api checkout .
-          git submodule update --init
-          # Apply a patch to support MySQL in the API and make building it work.
-          git -C api apply < patches/Process_Dashboard_API.patch
-        # https://taskfile.dev/docs/reference/schema#platforms
-        platforms: [darwin]
+          if [ -n "{{.API_ENABLED}}" ]; then
+            git -C api checkout .
+            git submodule update --init
+            # Apply a patch to support MySQL in the API and make building it work.
+            git -C api apply < patches/Process_Dashboard_API.patch
+          fi
 
       - task: compose
         vars:
           TASK_ARGS: up --build --detach --wait
 
+      # Unpatch API if API service is enabled.
+      - cmd: |
+          if [ -n "{{.API_ENABLED}}" ]; then
+            git -C api checkout .
+          fi
+
+    vars:
+      API_ENABLED:
+        # Check if the api service is enabled.
+        sh: (task --silent compose -- config --services  | grep "^api$") || true
+
   logs:
     desc: Show live logs
     cmds:
@@ -107,7 +118,6 @@ tasks:
     cmds:
       - task: api:fixtures:load
       - task: app:fixtures:load
-      - task: oidc:fixtures:load
 
   translations:extract:
     cmds:
@@ -209,8 +219,8 @@ tasks:
     cmds:
       - for:
           - /api/v1/auth/me
-          - /api/v1/processes/processes/
-          - /api/v1/processes/processes/1
+          - /api/v1/processes/
+          - /api/v1/processes/1
         task: api:get
         vars:
           API_PATH: "{{.ITEM}}"

docker-compose.oidc.yml

@@ -14,6 +14,8 @@ services:
         '{"sub": "user", "email": "[email protected]", "roles": ["user"]}',
         "--user-claims",
         '{"sub": "overview-manager", "email": "[email protected]", "roles": ["overview-manager"]}',
+        "--user-claims",
+        '{"sub": "admin", "email": "[email protected]", "roles": ["admin"]}',
       ]
     ports:
       - "80"