From a8a5abcce461c5ab01166c22cb93e9ccb05053f4 Mon Sep 17 00:00:00 2001 From: james Date: Tue, 7 Nov 2023 23:54:20 +0800 Subject: [PATCH 1/2] Fix developer page --- backend/api_app/controllers/apps.py | 5 +- backend/dbcon/queries.py | 29 +---------- frontend/src/routes/apps/[id]/+page.svelte | 20 +++++--- .../developers/[developer]/+page.server.ts | 49 ++++++++++++------- .../developers/[developer]/+page.svelte | 13 ++--- frontend/src/types.ts | 11 ++--- 6 files changed, 62 insertions(+), 65 deletions(-) diff --git a/backend/api_app/controllers/apps.py b/backend/api_app/controllers/apps.py index 2d59018..ff41eb1 100644 --- a/backend/api_app/controllers/apps.py +++ b/backend/api_app/controllers/apps.py @@ -244,10 +244,11 @@ async def get_developer_apps(self, developer_id: str) -> DeveloperApps: raise NotFoundException( f"Store ID not found: {developer_id!r}", status_code=404 ) - app_dict = apps_df.to_dict(orient="records")[0] + developer_name = apps_df.to_dict(orient="records")[0]["developer_name"] + apps_dict = apps_df.to_dict(orient="records") developer_apps = DeveloperApps( - developer_id=developer_id, title=app_dict["developer_name"], apps=app_dict + developer_id=developer_id, title=developer_name, apps=apps_dict ) return developer_apps diff --git a/backend/dbcon/queries.py b/backend/dbcon/queries.py index 36ecf93..667385a 100644 --- a/backend/dbcon/queries.py +++ b/backend/dbcon/queries.py @@ -255,32 +255,6 @@ def query_updated_timestamps( return df -def query_search_developers(search_input: str, limit: int = 1000): - logger.info(f"Developer search: {search_input=}") - search_input = f"%%{search_input}%%" - sel_query = f"""SELECT - d.*, - pd.*, - sa.* - FROM - app_urls_map aum - LEFT JOIN pub_domains pd ON - pd.id = aum.pub_domain - LEFT JOIN store_apps sa ON - sa.id = aum.store_app - LEFT JOIN developers d ON - d.id = sa.developer - WHERE - d.name ILIKE '{search_input}' - OR d.developer_id ILIKE '{search_input}' - OR pd.url ILIKE '{search_input}' - LIMIT {limit} - ; - """ - df = pd.read_sql(sel_query, DBCON.engine) - return df - - def get_all_tables_in_schema(schema_name: str): logger.info("Get checks tables") sel_schema = f"""SELECT table_name @@ -545,6 +519,7 @@ def query_single_developer(developer_id: str): sel_query = """SELECT d.name AS developer_name, pd.url as developer_url, + d.store as developer_store, sa.* FROM app_urls_map aum @@ -563,7 +538,7 @@ def query_single_developer(developer_id: str): DBCON.engine, params=(developer_id,), ) - if df.empty: + if not df.empty: df = clean_app_df(df) return df diff --git a/frontend/src/routes/apps/[id]/+page.svelte b/frontend/src/routes/apps/[id]/+page.svelte index 5807660..7522507 100644 --- a/frontend/src/routes/apps/[id]/+page.svelte +++ b/frontend/src/routes/apps/[id]/+page.svelte @@ -64,13 +64,21 @@
{#if appdata.developer_id} - Developer: {appdata.developer_name} +
+ Developer: {appdata.developer_name} +
{/if} - Category: {appdata.category} +
+ Category: {appdata.category} +
diff --git a/frontend/src/routes/developers/[developer]/+page.server.ts b/frontend/src/routes/developers/[developer]/+page.server.ts index 9373aec..fe6020e 100644 --- a/frontend/src/routes/developers/[developer]/+page.server.ts +++ b/frontend/src/routes/developers/[developer]/+page.server.ts @@ -1,30 +1,43 @@ -export const ssr: boolean = true; -export const csr: boolean = false; +import type { PageServerLoad } from './$types.js'; -import type { AppGroup, DeveloperResponse } from '../../../types.js'; +export const ssr: boolean = true; +export const csr: boolean = true; console.log('Script executed'); - -/** @type {import('../[developer]/$types').PageServerLoad} */ -export async function load({ params }): Promise { +export const load: PageServerLoad = async ({ params, locals }) => { const developerValue = params.developer; - console.log(`load started collection=${developerValue}`); + const res = fetch(`http://localhost:8000/api/apps/developers/${developerValue}`); + console.log(`load started developer=${developerValue}`); try { - const res = await fetch(`http://localhost:8000/api/apps/developers/${developerValue}`); - - if (!res.ok) { - const text = await res.text(); - throw new Error(`Failed to fetch developers status ${res.status} ${text}`); - } - - const app_collections: AppGroup = await res.json(); - console.log(`loaded developers with len: ${Object.keys(app_collections).length}`); - return { results: app_collections }; + return { + results: { + streamed: res + .then((resp) => { + if (resp.status === 200) { + return resp.json(); + } else if (resp.status === 404) { + console.log('App Not found'); + return 'App Not Found'; + } else if (resp.status === 500) { + console.log('API Server error'); + return 'Backend Error'; + } + }) + .then( + (json) => json, + (error) => { + console.log('Uncaught error', error); + return 'Uncaught Error'; + } + ) + } + }; } catch (error) { console.error('Failed to load data:', error); return { + results: { streamed: {} }, status: 500, error: 'Failed to load trending apps' }; } -} +}; diff --git a/frontend/src/routes/developers/[developer]/+page.svelte b/frontend/src/routes/developers/[developer]/+page.svelte index 84f920e..844a0f0 100644 --- a/frontend/src/routes/developers/[developer]/+page.svelte +++ b/frontend/src/routes/developers/[developer]/+page.svelte @@ -1,19 +1,20 @@
- {#await data} + {#await data.results.streamed}
Loading...
- {:then data} - {#if data.results} -

Apps: {data.results.title}

- + {:then devs} + {#if typeof devs == 'string'} + Failed to load developer + {:else} +

Apps: {devs.title}

+

{/if} {:catch error} diff --git a/frontend/src/types.ts b/frontend/src/types.ts index f5c7307..8348e0e 100644 --- a/frontend/src/types.ts +++ b/frontend/src/types.ts @@ -5,12 +5,6 @@ export interface AppGroup { title: string; } -export interface DeveloperResponse { - results?: AppGroup; - status?: number; - error?: string; -} - export interface Category { key: string; google: AppGroup; @@ -23,6 +17,11 @@ export interface CategoryResponse { error?: string; } +export interface DeveloperResponse { + results: { streamed: AppGroup }; + status?: number; + error?: string; +} export interface SearchResponse { results: { streamed: AppGroup }; status?: number; From 455dcb95b55f9ecaabf7b10f23caaa9d3ec15484 Mon Sep 17 00:00:00 2001 From: james Date: Tue, 28 Nov 2023 14:22:08 +0800 Subject: [PATCH 2/2] enforce developer_id as string in cases where developer ID was all numerical --- backend/api_app/controllers/apps.py | 1 + backend/dbcon/queries.py | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/api_app/controllers/apps.py b/backend/api_app/controllers/apps.py index ff41eb1..730aba2 100644 --- a/backend/api_app/controllers/apps.py +++ b/backend/api_app/controllers/apps.py @@ -240,6 +240,7 @@ async def get_developer_apps(self, developer_id: str) -> DeveloperApps: """ logger.info(f"{self.path} start") apps_df = query_single_developer(developer_id) + if apps_df.empty: raise NotFoundException( f"Store ID not found: {developer_id!r}", status_code=404 diff --git a/backend/dbcon/queries.py b/backend/dbcon/queries.py index 667385a..e4ad8b8 100644 --- a/backend/dbcon/queries.py +++ b/backend/dbcon/queries.py @@ -481,16 +481,14 @@ def clean_app_df(df: pd.DataFrame) -> pd.DataFrame: play_link = "https://play.google.com/store/apps/details?id=" play_dev_link = "https://play.google.com/store/apps/dev?id=" ios_dev_link = "https://apps.apple.com/us/developer/-/id" - df["store_link"] = ( np.where(df["store"].str.contains("Google"), play_link, ios_link) + df["store_id"] ) if "developer_id" in df.columns: - df["store_developer_link"] = ( - np.where(df["store"].str.contains("Google"), play_dev_link, ios_dev_link) - + df["developer_id"] - ) + df["store_developer_link"] = np.where( + df["store"].str.contains("Google"), play_dev_link, ios_dev_link + ) + df["developer_id"].astype(str) date_cols = ["created_at", "store_last_updated", "updated_at"] for x in date_cols: