From fd7f92ba6fa9616821cf5898b9daa2f5bcad2f7a Mon Sep 17 00:00:00 2001 From: Joseph Nelson Date: Sun, 31 May 2026 22:32:23 -0700 Subject: [PATCH 1/6] working on testing connection to pg --- .gitea/workflows/build.yaml | 2 +- src/config/index.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 995b515..04eb9f4 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -3,7 +3,7 @@ on: pull_request: branches: - main - types: [closed] + #types: [closed] jobs: build-and-push: if: gitea.event.pull_request.merged == true diff --git a/src/config/index.js b/src/config/index.js index 5629e23..8a90c6d 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -9,6 +9,8 @@ const database = { port: parseInt(process.env.DB_PORT, 10), } +console.log(database) + export const pool = new Pool(database) export const jwtEnv = { -- 2.52.0 From 32523a904c79392b722293522e036bb45185b274 Mon Sep 17 00:00:00 2001 From: Joseph Nelson Date: Sun, 31 May 2026 22:42:29 -0700 Subject: [PATCH 2/6] trying to trigger docker build --- .gitea/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 04eb9f4..0126986 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,8 +1,8 @@ name: Build and Push Image -on: - pull_request: - branches: - - main +#on: +# pull_request: +# branches: +# - main #types: [closed] jobs: build-and-push: -- 2.52.0 From febfe787fa2ba8c1653a59ea6fdfa716c2f0e18e Mon Sep 17 00:00:00 2001 From: Joseph Nelson Date: Sun, 31 May 2026 22:43:22 -0700 Subject: [PATCH 3/6] run on push --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 0126986..8c9786f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,5 +1,5 @@ name: Build and Push Image -#on: +on: [push] # pull_request: # branches: # - main -- 2.52.0 From f4480a11c2592f05d43d6598db1d425a0033affe Mon Sep 17 00:00:00 2001 From: Joseph Nelson Date: Sun, 31 May 2026 22:44:02 -0700 Subject: [PATCH 4/6] removed conditional --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 8c9786f..6967dae 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -6,7 +6,7 @@ on: [push] #types: [closed] jobs: build-and-push: - if: gitea.event.pull_request.merged == true + #if: gitea.event.pull_request.merged == true runs-on: ubuntu-latest container: image: catthehacker/ubuntu:act-latest -- 2.52.0 From f0e8d28c65b4a39205b561fa62f677f03ec46ae0 Mon Sep 17 00:00:00 2001 From: Joseph Nelson Date: Sun, 31 May 2026 22:49:56 -0700 Subject: [PATCH 5/6] fixed ENV vars --- src/config/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/index.js b/src/config/index.js index 8a90c6d..0272776 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -3,9 +3,9 @@ import { Pool } from 'pg' const database = { host: process.env.DB_HOST, - user: process.env.DB_USER, + user: process.env.DB_USERNAME, password: process.env.DB_PASSWORD, - database: process.env.DB_NAME, + database: process.env.DB_DATABASE, port: parseInt(process.env.DB_PORT, 10), } -- 2.52.0 From b5dd0db4c29ee414bb3011974b7eed38d5283ab6 Mon Sep 17 00:00:00 2001 From: Joseph Nelson Date: Sun, 31 May 2026 23:09:56 -0700 Subject: [PATCH 6/6] fixed the issue now --- .gitea/workflows/build.yaml | 12 +-- src/config/index.js | 2 - ...dd-autogenerate-record-id-on-all-tables.js | 75 +++++++++++++++++++ 3 files changed, 81 insertions(+), 8 deletions(-) create mode 100644 src/migrations/010_add-autogenerate-record-id-on-all-tables.js diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 6967dae..995b515 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,12 +1,12 @@ name: Build and Push Image -on: [push] -# pull_request: -# branches: -# - main - #types: [closed] +on: + pull_request: + branches: + - main + types: [closed] jobs: build-and-push: - #if: gitea.event.pull_request.merged == true + if: gitea.event.pull_request.merged == true runs-on: ubuntu-latest container: image: catthehacker/ubuntu:act-latest diff --git a/src/config/index.js b/src/config/index.js index 0272776..607e635 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -9,8 +9,6 @@ const database = { port: parseInt(process.env.DB_PORT, 10), } -console.log(database) - export const pool = new Pool(database) export const jwtEnv = { diff --git a/src/migrations/010_add-autogenerate-record-id-on-all-tables.js b/src/migrations/010_add-autogenerate-record-id-on-all-tables.js new file mode 100644 index 0000000..f03a716 --- /dev/null +++ b/src/migrations/010_add-autogenerate-record-id-on-all-tables.js @@ -0,0 +1,75 @@ +export const up = (pgm) => { + pgm.sql(` + ALTER TABLE roles + ALTER COLUMN id DROP DEFAULT, + ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()), + ALTER COLUMN id SET DEFAULT gen_random_uuid(); + `) + pgm.sql(` + ALTER TABLE images + ALTER COLUMN id DROP DEFAULT, + ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()), + ALTER COLUMN id SET DEFAULT gen_random_uuid(); + `) + pgm.sql(` + ALTER TABLE collections + ALTER COLUMN id DROP DEFAULT, + ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()), + ALTER COLUMN id SET DEFAULT gen_random_uuid(); + `) + pgm.sql(` + ALTER TABLE items + ALTER COLUMN id DROP DEFAULT, + ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()), + ALTER COLUMN id SET DEFAULT gen_random_uuid(); + `) + pgm.sql(` + ALTER TABLE locations + ALTER COLUMN id DROP DEFAULT, + ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()), + ALTER COLUMN id SET DEFAULT gen_random_uuid(); + `) + pgm.sql(` + ALTER TABLE sets + ALTER COLUMN id DROP DEFAULT, + ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()), + ALTER COLUMN id SET DEFAULT gen_random_uuid(); + `) + pgm.sql(` + ALTER TABLE users + ALTER COLUMN id DROP DEFAULT, + ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()), + ALTER COLUMN id SET DEFAULT gen_random_uuid(); + `) +} + +export const down = (pmg) => { + pgm.sql(` + ALTER TABLE roles + ALTER COLUMN id DROP DEFAULT; + `) + pgm.sql(` + ALTER TABLE images + ALTER COLUMN id DROP DEFAULT; + `) + pgm.sql(` + ALTER TABLE collections + ALTER COLUMN id DROP DEFAULT; + `) + pgm.sql(` + ALTER TABLE items + ALTER COLUMN id DROP DEFAULT; + `) + pgm.sql(` + ALTER TABLE locations + ALTER COLUMN id DROP DEFAULT; + `) + pgm.sql(` + ALTER TABLE sets + ALTER COLUMN id DROP DEFAULT; + `) + pgm.sql(` + ALTER TABLE users + ALTER COLUMN id DROP DEFAULT; + `) +} -- 2.52.0