From c9c9b2a1ae5e946069a36b18ff3d66329a7aec3d Mon Sep 17 00:00:00 2001
From: HungLV <lehung0194@gmail.com>
Date: Wed, 14 Aug 2024 11:23:32 +0700
Subject: [PATCH] fix: CI/CD build, and graphql

---
 .env.public                                   |  3 ++
 .gitignore                                    |  1 +
 Dockerfile                                    |  3 +-
 src/lib/apis/product/create-product.ts        | 16 +++++-----
 src/lib/apis/product/get-product.ts           | 18 +++++++----
 src/routes/(sidebar)/crud/products/+page.ts   |  4 +--
 .../(sidebar)/crud/products/Product.svelte    | 13 ++++----
 .../(sidebar)/crud/products/[id]/+page.ts     |  8 ++---
 .../crud/products/create/+page.server.ts      | 30 ++++++++++++-------
 .../(sidebar)/crud/products/create/+page.ts   |  4 +--
 10 files changed, 61 insertions(+), 39 deletions(-)
 create mode 100644 .env.public

diff --git a/.env.public b/.env.public
new file mode 100644
index 0000000..b59f20c
--- /dev/null
+++ b/.env.public
@@ -0,0 +1,3 @@
+PUBLIC_GRAPHQL_ENDPOINT="https://graphql.dev.seekhype.io/v1/graphql"
+# PUBLIC_API_ENDPOINT="https://ip.dev.aurascan.io"
+PUBLIC_API_ENDPOINT="http://localhost:3000"
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 8a6c2f3..f9f0320 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ node_modules
 .env
 .env.*
 !.env.example
+!.env.public
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
 /test-results
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 334a2a3..b16274a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM node:20-alpine AS builder
 WORKDIR /staging
 COPY . /staging/
+COPY ./.env.public /staging/.env
 RUN corepack enable && \
   yarn install --frozen-lockfile && \
   yarn build
@@ -12,4 +13,4 @@ COPY --from=builder /staging/node_modules /app/node_modules
 COPY --from=builder /staging/build /app/build
 
 EXPOSE 3000
-CMD ["node", "-r", "dotenv/config", "/app/build/index.js"]
\ No newline at end of file
+CMD ["node", "-r", "dotenv/config", "/app/build/index.js"]
diff --git a/src/lib/apis/product/create-product.ts b/src/lib/apis/product/create-product.ts
index 22ccb17..b44c216 100644
--- a/src/lib/apis/product/create-product.ts
+++ b/src/lib/apis/product/create-product.ts
@@ -2,19 +2,19 @@ import { config } from '$lib/public-config';
 
 export interface CreateProductRequest {
 	name: string;
-	category: string;
-	description: string;
+	owner_id: number;
 	avatar_img: string;
 	banner_img: string;
-	metadata: any;
-	owner: { id: number };
-	featured_at: string | null;
-	attributes: { name: string; value: string }[];
+	category: string;
+	description: string;
+	metadata: { previews?: string[]; cta_link?: string };
+	featured?: boolean;
+	attributes?: { name: string; value: string }[];
 	collections?: { chain_id: string; contract_address: string }[];
 }
 
-export async function createProduct(data: CreateProductRequest): Promise<void> {
-	await fetch(`${config.apiEndpoint}/products`, {
+export async function createProduct(data: CreateProductRequest): Promise<Response> {
+	return fetch(`${config.apiEndpoint}/products`, {
 		method: 'POST',
 		body: JSON.stringify(data),
 		headers: {
diff --git a/src/lib/apis/product/get-product.ts b/src/lib/apis/product/get-product.ts
index 1663161..65a86a7 100644
--- a/src/lib/apis/product/get-product.ts
+++ b/src/lib/apis/product/get-product.ts
@@ -8,7 +8,7 @@ export interface ProductGetResponseData {
 	banner_img: string;
 	category: string;
 	description: string;
-	created_at: string;
+	created_at?: string;
 	featured_at: string | null;
 	attributes: { id: number; name: string; value: string }[];
 	metadata: any;
@@ -50,10 +50,12 @@ export async function getProductById(id: number): Promise<ProductGetResponseData
           id
           name
         }
-        collections {
-          id
-          chain_id
-          contract_address
+        collections: product_collections {
+          collection {
+            id
+            chain_id
+            contract_address
+          }
         }
       }
     }
@@ -68,5 +70,9 @@ export async function getProductById(id: number): Promise<ProductGetResponseData
 		})
 	})
 		.then((response) => response.json())
-		.then((response) => response.data.ipscan_products[0]);
+		.then((response) => {
+      return {
+        ...response.data.ipscan_products[0],
+        collections: response.data.ipscan_products[0]?.collections?.map((c: any) => c.collection)
+    }});
 }
diff --git a/src/routes/(sidebar)/crud/products/+page.ts b/src/routes/(sidebar)/crud/products/+page.ts
index a46368d..35ca5f1 100644
--- a/src/routes/(sidebar)/crud/products/+page.ts
+++ b/src/routes/(sidebar)/crud/products/+page.ts
@@ -7,8 +7,8 @@ import { type ProductGetResponseData } from '$lib/apis/product/get-product';
 export interface ProductPageData {
 	mode?: string;
 	product?: ProductGetResponseData;
-	status: string[];
-	selected_status?: string[];
+	statuses: string[];
+	selected_statuses?: string[];
 	genres: string[];
 	selected_genres?: string[];
 	player_supports: string[];
diff --git a/src/routes/(sidebar)/crud/products/Product.svelte b/src/routes/(sidebar)/crud/products/Product.svelte
index 06d05d3..0af03f4 100644
--- a/src/routes/(sidebar)/crud/products/Product.svelte
+++ b/src/routes/(sidebar)/crud/products/Product.svelte
@@ -29,6 +29,7 @@
 
 	export let data: ProductPageData;
 	export let mode: string = PAGE_MODE.CREATE;
+	export let form: any;
 
 	const path: string = '/crud/products/create';
 	$: description = `A place to ${mode} a single product`;
@@ -37,6 +38,8 @@
 
 	let openDelete: boolean = false;
 	$: isViewMode = mode === PAGE_MODE.VIEW;
+
+	console.log(form);
 </script>
 
 <MetaTag {path} {description} {title} {subtitle} />
@@ -86,7 +89,7 @@
 						<Select
 							class="w-22 me-4"
 							items={PRODUCT_CATEGORIES.map((c) => ({ name: c, value: c }))}
-							selected={data.product?.category}
+							selected={data.product?.category || ''}
 							selectProps={{
 								name: 'category',
 								disabled: isViewMode
@@ -211,8 +214,8 @@
 						name="Status"
 						placeholder="e.g. Ethereum"
 						class="mb-2 me-4 mt-3 w-full"
-						items={data.status}
-						selected={data.selected_status}
+						items={data.statuses}
+						selected={data.selected_statuses}
 						multiSelectProps={{
 							name: 'statuses',
 							allowUserOptions: 'append',
@@ -223,8 +226,8 @@
 						name="Player info"
 						placeholder="e.g. Ethereum"
 						class="mb-2 me-4 mt-3 w-full"
-						items={data.status}
-						selected={data.selected_status}
+						items={data.player_supports}
+						selected={data.selected_player_supports}
 						multiSelectProps={{
 							name: 'players_infos',
 							allowUserOptions: 'append',
diff --git a/src/routes/(sidebar)/crud/products/[id]/+page.ts b/src/routes/(sidebar)/crud/products/[id]/+page.ts
index acbe7cb..2d3e1ff 100644
--- a/src/routes/(sidebar)/crud/products/[id]/+page.ts
+++ b/src/routes/(sidebar)/crud/products/[id]/+page.ts
@@ -15,10 +15,10 @@ export async function load(pageLoadEvent): Promise<ProductPageData> {
 	return {
 		mode: pageLoadEvent.url.searchParams.get('mode') as string,
 		product,
-		status: nameToValues['status']?.map((v) => v.value),
-		selected_status: selectedNameToValues['status']?.map((v) => v.value),
-		genres: nameToValues['player support']?.map((v) => v.value),
-		selected_genres: selectedNameToValues['player support']?.map((v) => v.value),
+		statuses: nameToValues['status']?.map((v) => v.value),
+		selected_statuses: selectedNameToValues['status']?.map((v) => v.value),
+		genres: nameToValues['genre']?.map((v) => v.value),
+		selected_genres: selectedNameToValues['genre']?.map((v) => v.value),
 		player_supports: nameToValues['player support']?.map((v) => v.value),
 		selected_player_supports: selectedNameToValues['player support']?.map((v) => v.value),
 		game_modes: nameToValues['game mode']?.map((v) => v.value),
diff --git a/src/routes/(sidebar)/crud/products/create/+page.server.ts b/src/routes/(sidebar)/crud/products/create/+page.server.ts
index 572701f..4d1a0a8 100644
--- a/src/routes/(sidebar)/crud/products/create/+page.server.ts
+++ b/src/routes/(sidebar)/crud/products/create/+page.server.ts
@@ -1,24 +1,24 @@
 import { createProduct } from '$lib/apis/product/create-product';
+import { fail, redirect } from '@sveltejs/kit';
 
 export const actions = {
-	default: async ({ cookies, request }) => {
+	default: async ({ request }) => {
 		const data = await request.formData();
-		console.log(data);
 
 		const requestData = {
-			banner_img: data.get('banner_img') as string,
-			avatar_img: data.get('avatar_img') as string,
+			banner_img: data.get('banner_img') as string, // TODO upload banner
+			avatar_img: data.get('avatar_img') as string, // TODO upload img
 			name: data.get('name') as string,
-			featured_at: new Date().toISOString(),
+			featured: data.get('featured') === 'true',
 			category: data.get('category') as string,
 			collections: JSON.parse(data.get('collections') as string),
 			description: data.get('about') as string,
-			owner: { id: 1 }, // TODO get users
-			metadata: JSON.stringify({
+			owner_id: 1, // TODO get users
+			metadata: {
 				// previews: data.get("previews"), TODO upload then use url
 				previews: JSON.parse(data.get('previews') as string).map(() => 'http://demmo.jjj'),
-				cta_url: data.get('cta_url')
-			}), // TODO use object instead
+				cta_url: data.get('cta_url') || undefined
+			},
 			attributes: [
 				...JSON.parse(data.get('statuses') as string).map((value: string) => ({
 					name: 'status',
@@ -38,7 +38,15 @@ export const actions = {
 				}))
 			]
 		};
-		console.log(JSON.stringify(requestData));
-		await createProduct(requestData);
+
+		const createResponse = await createProduct(requestData);
+
+		const responseData = await createResponse.json();
+
+		if (createResponse.status === 200) {
+			throw redirect(303, `/crud/products/${responseData.data.id}`);
+		} else {
+			return fail(responseData.statusCode, responseData);
+		}
 	}
 };
diff --git a/src/routes/(sidebar)/crud/products/create/+page.ts b/src/routes/(sidebar)/crud/products/create/+page.ts
index 4281169..76310a6 100644
--- a/src/routes/(sidebar)/crud/products/create/+page.ts
+++ b/src/routes/(sidebar)/crud/products/create/+page.ts
@@ -20,8 +20,8 @@ export async function load(): Promise<ProductPageData> {
 			attributes: [],
 			collections: []
 		},
-		status: nameToValues['status']?.map((v) => v.value),
-		genres: nameToValues['player support']?.map((v) => v.value),
+		statuses: nameToValues['status']?.map((v) => v.value),
+		genres: nameToValues['genre']?.map((v) => v.value),
 		player_supports: nameToValues['player support']?.map((v) => v.value),
 		game_modes: nameToValues['game mode']?.map((v) => v.value)
 	};