Merge remote-tracking branch 'origin/dev' into generate-toml

# Conflicts: # backend/migrations/000027_asset_image.down.sql # backend/migrations/000027_asset_image.up.sql
CheesecakeLabs · Oct 10, 2023 · 2cb7000 · 2cb7000
2 parents 80f58f8 + 402856a
commit 2cb7000
Show file tree

Hide file tree

Showing 122 changed files with 2,723 additions and 848 deletions.
diff --git a/.github/workflows/frontend-cicd.yaml b/.github/workflows/frontend-cicd.yaml
@@ -92,6 +92,7 @@ jobs:
           build-args: |
             REACT_APP_API_URL=${{ vars.REACT_APP_API_URL }}
             REACT_APP_SENTRY_DSN=${{ secrets.REACT_APP_SENTRY_DSN }}
+            REACT_APP_PUBLIC_URL=${{ vars.REACT_APP_PUBLIC_URL }}
           outputs: type=docker,dest=/tmp/docker_image.tar
 
       - name: Upload artifact

diff --git a/backend/internal/usecase/mocks/mocks.go b/backend/internal/usecase/mocks/mocks.go
diff --git a/backend/internal/usecase/repo/asset_postgres.go b/backend/internal/usecase/repo/asset_postgres.go
@@ -127,8 +127,8 @@ func (r AssetRepo) GetAssetByCode(code string) (entity.Asset, error) {
 
 func (r AssetRepo) CreateAsset(data entity.Asset) (entity.Asset, error) {
 	res := data
-	stmt := `INSERT INTO Asset (code, issuer_id, distributor_id, name, asset_type) VALUES ($1, $2, $3,$4, $5) RETURNING id;`
-	err := r.Db.QueryRow(stmt, data.Code, data.Issuer.Id, data.Distributor.Id, data.Name, data.AssetType).Scan(&res.Id)
+	stmt := `INSERT INTO Asset (code, issuer_id, distributor_id, name, asset_type, image) VALUES ($1, $2, $3,$4, $5, $6) RETURNING id;`
+	err := r.Db.QueryRow(stmt, data.Code, data.Issuer.Id, data.Distributor.Id, data.Name, data.AssetType, data.Image).Scan(&res.Id)
 	if err != nil {
 		return entity.Asset{}, fmt.Errorf("AssetRepo - CreateAsset - db.QueryRow: %w", err)
 	}

diff --git a/backend/migrations/000027_asset_image.down.sql b/backend/migrations/000027_asset_image.down.sql
@@ -0,0 +1 @@
+ALTER TABLE asset DROP COLUMN image;
diff --git a/backend/migrations/000027_asset_image.up.sql b/backend/migrations/000027_asset_image.up.sql
@@ -0,0 +1 @@
+ALTER TABLE asset ADD COLUMN image BYTEA;
diff --git a/frontend/.idea/workspace.xml b/frontend/.idea/workspace.xml
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -10,8 +10,10 @@ ENTRYPOINT [ "make", "start_dev"]
 FROM base AS builder
 ARG REACT_APP_API_URL
 ARG REACT_APP_SENTRY_DSN
+ARG REACT_APP_PUBLIC_URL
 ENV REACT_APP_API_URL=${REACT_APP_API_URL:?"ERR: REACT_APP_API_URL not set in Dockerfile"}
 ENV REACT_APP_SENTRY_DSN=${REACT_APP_SENTRY_DSN:?"ERR: REACT_APP_SENTRY_DSN not set in Dockerfile"}
+ENV PUBLIC_URL=${REACT_APP_PUBLIC_URL:?"ERR: REACT_APP_PUBLIC_URL not set in Dockerfile"}
 RUN make build
 
 FROM node:16.13-bullseye-slim AS remote