From fb100514432d311b3c6867f2f9f10bc987560db5 Mon Sep 17 00:00:00 2001
From: 0x1d <admin@dcentral.systems>
Date: Fri, 7 Nov 2025 08:41:03 +0100
Subject: [PATCH] fix(ci): generate Ent from ent/schema and copy to
 internal/ent

---
 .github/workflows/ci.yml | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 81152aa..2790c53 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,19 +43,20 @@ jobs:
       - name: Generate code
         run: |
           make generate-proto
-          echo "Checking for ent directory..."
-          if [ -d "ent" ] && [ -f "ent/generate.go" ]; then
+          echo "Checking for Ent schema directory..."
+          if [ -d "ent/schema" ]; then
             echo "Generating Ent code..."
             go install entgo.io/ent/cmd/ent@latest
-            cd ent && go run -mod=mod entgo.io/ent/cmd/ent generate ./schema
+            cd ent/schema && go run -mod=mod entgo.io/ent/cmd/ent generate .
             echo "Copying Ent code to internal/ent..."
-            mkdir -p ../internal/ent
-            find . -name "*.go" -type f ! -path "./schema/*" -exec sh -c 'mkdir -p ../internal/ent/$(dirname "{}") && cp "{}" ../internal/ent/"{}"' \;
+            cd .. && mkdir -p ../internal/ent
+            cp -r *.go */ ../internal/ent/ 2>/dev/null || true
             rm -f ../internal/ent/generate.go
+            rm -rf ../internal/ent/schema
             echo "Verifying internal/ent/ent.go exists..."
             ls -la ../internal/ent/ent.go || echo "ERROR: ent.go not found!"
           else
-            echo "WARNING: ent directory or generate.go not found!"
+            echo "WARNING: ent/schema directory not found!"
           fi
 
       - name: Check for test files
@@ -114,19 +115,20 @@ jobs:
       - name: Generate code
         run: |
           make generate-proto
-          echo "Checking for ent directory..."
-          if [ -d "ent" ] && [ -f "ent/generate.go" ]; then
+          echo "Checking for Ent schema directory..."
+          if [ -d "ent/schema" ]; then
             echo "Generating Ent code..."
             go install entgo.io/ent/cmd/ent@latest
-            cd ent && go run -mod=mod entgo.io/ent/cmd/ent generate ./schema
+            cd ent/schema && go run -mod=mod entgo.io/ent/cmd/ent generate .
             echo "Copying Ent code to internal/ent..."
-            mkdir -p ../internal/ent
-            find . -name "*.go" -type f ! -path "./schema/*" -exec sh -c 'mkdir -p ../internal/ent/$(dirname "{}") && cp "{}" ../internal/ent/"{}"' \;
+            cd .. && mkdir -p ../internal/ent
+            cp -r *.go */ ../internal/ent/ 2>/dev/null || true
             rm -f ../internal/ent/generate.go
+            rm -rf ../internal/ent/schema
             echo "Verifying internal/ent/ent.go exists..."
             ls -la ../internal/ent/ent.go || echo "ERROR: ent.go not found!"
           else
-            echo "WARNING: ent directory or generate.go not found!"
+            echo "WARNING: ent/schema directory not found!"
           fi
 
       - name: Install golangci-lint
@@ -170,19 +172,20 @@ jobs:
       - name: Generate code
         run: |
           make generate-proto
-          echo "Checking for ent directory..."
-          if [ -d "ent" ] && [ -f "ent/generate.go" ]; then
+          echo "Checking for Ent schema directory..."
+          if [ -d "ent/schema" ]; then
             echo "Generating Ent code..."
             go install entgo.io/ent/cmd/ent@latest
-            cd ent && go run -mod=mod entgo.io/ent/cmd/ent generate ./schema
+            cd ent/schema && go run -mod=mod entgo.io/ent/cmd/ent generate .
             echo "Copying Ent code to internal/ent..."
-            mkdir -p ../internal/ent
-            find . -name "*.go" -type f ! -path "./schema/*" -exec sh -c 'mkdir -p ../internal/ent/$(dirname "{}") && cp "{}" ../internal/ent/"{}"' \;
+            cd .. && mkdir -p ../internal/ent
+            cp -r *.go */ ../internal/ent/ 2>/dev/null || true
             rm -f ../internal/ent/generate.go
+            rm -rf ../internal/ent/schema
             echo "Verifying internal/ent/ent.go exists..."
             ls -la ../internal/ent/ent.go || echo "ERROR: ent.go not found!"
           else
-            echo "WARNING: ent directory or generate.go not found!"
+            echo "WARNING: ent/schema directory not found!"
           fi
 
       - name: Build