From a6f3c6c6953fab7bf06215ed0b6fb43cc44c97d5 Mon Sep 17 00:00:00 2001
From: bloodwiing <bloodwiing+git@alchemix.dev>
Date: Wed, 15 May 2024 00:41:28 +0300
Subject: [PATCH] Refactor: Better Post Metrics data fetching

---
 src/comp/page/post.svelte                     |   2 +
 src/comp/postlist.svelte                      |  10 ++
 src/lib/server/db/post.js                     |  39 ++++--
 src/lib/server/db/postmertics.js              | 123 ++++++++++++------
 src/routes/(app)/posts/+page.server.js        |  15 ++-
 src/routes/(app)/posts/+page.svelte           |   4 +-
 src/routes/(app)/posts/[name]/+page.server.js |   3 -
 src/types/base.ts                             |  35 +++--
 8 files changed, 154 insertions(+), 77 deletions(-)

diff --git a/src/comp/page/post.svelte b/src/comp/page/post.svelte
index 1c8e1c9..6dc8fc9 100644
--- a/src/comp/page/post.svelte
+++ b/src/comp/page/post.svelte
@@ -14,6 +14,8 @@
    * @type {import("$types/base").CommentTreeNode[] | null}
    */
   export let commentTree = null;
+
+  $: isPreview = commentTree == null;
 </script>
 
 <style lang="scss">
diff --git a/src/comp/postlist.svelte b/src/comp/postlist.svelte
index c44a50d..51bacc8 100644
--- a/src/comp/postlist.svelte
+++ b/src/comp/postlist.svelte
@@ -24,12 +24,22 @@
     posts.forEach((p, index) => {
       hidden[index] = p == post;
     });
+
+    goto(`/posts?glance=${currentPreview.id}`, {
+      replaceState: true,
+      noScroll: true
+    });
   }
 
   function dismiss() {
     currentPreview = null;
 
     hidden = Array(posts.length).fill(false);
+
+    // goto(`/posts`, {
+    //   replaceState: true,
+    //   noScroll: true
+    // });
   }
 
   function expand() {
diff --git a/src/lib/server/db/post.js b/src/lib/server/db/post.js
index 0444950..4cfec5d 100644
--- a/src/lib/server/db/post.js
+++ b/src/lib/server/db/post.js
@@ -3,15 +3,32 @@ import { getUser, getUsersCachedByRef } from './user';
 
 /**
  * @typedef {import('$types/base').Post} Post
+ * @typedef {import('$types/base').PostMetrics} PostMetrics
  */
 
+/**
+ * @param {import('postgres').Row} row 
+ * @returns {PostMetrics}
+ */
+function parsePostMetricsFromRow(row) {
+  return {
+    commentCount: BigInt(row['comment_count']),
+    userCount: BigInt(row['user_count']),
+    latestActivity: row['latest_activity'],
+    engagement: BigInt(row['engagement']),
+    age: row['age'],
+    relevancy: row['relevancy'],
+  };
+}
+
 /**
  * @param {import('$types/base').User | null} author 
  * @param {import('$types/base').Category} category 
  * @param {import('postgres').Row} row 
+ * @param {boolean} withMetrics 
  * @returns {Post}
  */
-function parsePostFromRow(author, category, row) {
+function parsePostFromRow(author, category, row, withMetrics = false) {
   return {
     id: row['id'],
     author: author,
@@ -22,7 +39,8 @@ function parsePostFromRow(author, category, row) {
     rating: {
       likes: BigInt(row['likes']),
       dislikes: BigInt(row['dislikes']),
-    }
+    },
+    metrics: withMetrics ? parsePostMetricsFromRow(row) : null,
   };
 }
 
@@ -31,19 +49,15 @@ function parsePostFromRow(author, category, row) {
  * @param {import('$types/base').Category | undefined} category 
  * @param {number} limit 
  * @param {number} offset 
+ * @param {boolean} withMetrics
  * @returns {Promise<Post[]>}
  */
-export async function getPosts(sql, category = undefined, limit = 10, offset = 0) {
-  let filter;
-  
-  if (category === undefined) {
-    filter = sql``;
-  } else {
-    filter = sql`WHERE category_id = ${ category.id }`;
-  }
+export async function getPosts(sql, category = undefined, limit = 10, offset = 0, withMetrics = false) {
+  const filter = category === undefined ? sql`` : sql`WHERE category_id = ${ category.id }`;
+  const metrics = !withMetrics ? sql`` : sql`, comment_count, user_count, latest_activity, engagement, age, relevancy`;
 
   const query = sql`
-    SELECT id, author_id, name, category_id, latest_content, created_date, likes, dislikes
+    SELECT id, author_id, name, category_id, latest_content, created_date, likes, dislikes ${ metrics }
     FROM doki8902.message_post
     ${ filter }
     FETCH FIRST ${ limit } ROWS ONLY
@@ -60,7 +74,8 @@ export async function getPosts(sql, category = undefined, limit = 10, offset = 0
   return posts.map(row => parsePostFromRow(
     users.get(row['author_id']) || null,
     /** @type {import('$types/base').Category} */ (categories.get(row['category_id'])),
-    row
+    row,
+    withMetrics
   ));
 }
 
diff --git a/src/lib/server/db/postmertics.js b/src/lib/server/db/postmertics.js
index e30a80f..d2d3a41 100644
--- a/src/lib/server/db/postmertics.js
+++ b/src/lib/server/db/postmertics.js
@@ -1,46 +1,89 @@
-/**
- * @typedef {import('$types/base').PostMetrics} PostMetrics
- */
+// /**
+//  * @typedef {import('$types/base').PostMetrics} PostMetrics
+//  */
 
-import { sql } from '$lib/db.server';
+// import { sql } from '$lib/db.server';
 
-/**
- * @param {import('$types/base').Post} post 
- * @param {import('postgres').Row} row 
- * @returns {PostMetrics}
- */
-function parsePostMetricsFromRow(post, row) {
-  return {
-    post: post,
-    commentCount: BigInt(row['comment_count']),
-    userCount: BigInt(row['user_count']),
-    latestActivity: row['latest_activity'],
-    rating: post.rating,
-    score: BigInt(row['score']),
-    engagement: BigInt(row['engagement']),
-    age: row['age'],
-    relevancy: row['relevancy']
-  };
-}
+// /**
+//  * @param {import('$types/base').Post} post 
+//  * @param {import('postgres').Row} row 
+//  * @returns {PostMetrics}
+//  */
+// function parsePostMetricsFromRowAndPost(post, row) {
+//   return {
+//     postId: post.id,
+//     commentCount: BigInt(row['comment_count']),
+//     userCount: BigInt(row['user_count']),
+//     latestActivity: row['latest_activity'],
+//     rating: post.rating,
+//     score: BigInt(row['score']),
+//     engagement: BigInt(row['engagement']),
+//     age: row['age'],
+//     relevancy: row['relevancy']
+//   };
+// }
 
-/**
- * @param {import('$types/base').Post} post 
- * @returns {Promise<PostMetrics | import('$types/error').Error>}
- */
-export async function getPostMetrics(post) {
-  const query = sql`
-  SELECT comment_count, user_count, latest_activity, score, engagement, age, relevancy
-  FROM doki8902.post_metrics
-  WHERE post_id = ${ post.id }`;
+// /**
+//  * @param {import('postgres').Row} row 
+//  * @returns {PostMetrics}
+//  */
+// function parsePostMetricsFromRow(row) {
+//   return {
+//     postId: row['post_id'],
+//     commentCount: BigInt(row['comment_count']),
+//     userCount: BigInt(row['user_count']),
+//     latestActivity: row['latest_activity'],
+//     rating: {
+//       likes: row['likes'],
+//       dislikes: row['dislikes']
+//     },
+//     score: BigInt(row['score']),
+//     engagement: BigInt(row['engagement']),
+//     age: row['age'],
+//     relevancy: row['relevancy']
+//   };
+// }
 
-  const result = await query;
+// /**
+//  * @param {import('$types/base').Post} post 
+//  * @returns {Promise<PostMetrics | import('$types/error').Error>}
+//  */
+// export async function getPostMetricsForPost(post) {
+//   const query = sql`
+//   SELECT comment_count, user_count, latest_activity, score, engagement, age, relevancy
+//   FROM doki8902.post_metrics
+//   WHERE post_id = ${ post.id }`;
 
-  if (result.length == 0) {
-    return {
-      error: true,
-      msg: `Could not find PostMetrics for Post ID ${post.id}`
-    };
-  }
+//   const result = await query;
 
-  return parsePostMetricsFromRow(post, result[0]);
-}
+//   if (result.length == 0) {
+//     return {
+//       error: true,
+//       msg: `Could not find PostMetrics for Post ID ${post.id}`
+//     };
+//   }
+
+//   return parsePostMetricsFromRowAndPost(post, result[0]);
+// }
+
+// /**
+//  * @param {number} post_id 
+//  * @returns {Promise<PostMetrics | import('$types/error').Error>}
+//  */
+// export async function getPostMetricsForPostId(post_id) {
+//   const query = sql`
+//   SELECT post_id, comment_count, user_count, latest_activity, likes, dislikes, score, engagement, age, relevancy
+//   FROM doki8902.post_metrics
+//   WHERE post_id = ${ post_id }`;
+
+//   const result = await query;
+
+//   if (result.length == 0) {
+//     return {
+//       error: true,
+//       msg: `Could not find PostMetrics for Post ID ${post_id}`
+//     };
+//   }
+
+//   return parsePostMetricsFromRow(result[0]);
+// }
diff --git a/src/routes/(app)/posts/+page.server.js b/src/routes/(app)/posts/+page.server.js
index 6c4b64c..e63d120 100644
--- a/src/routes/(app)/posts/+page.server.js
+++ b/src/routes/(app)/posts/+page.server.js
@@ -1,9 +1,20 @@
 import { getPosts } from '$lib/server/db/post';
+import { getPostMetricsForPostId } from '$lib/server/db/postmertics';
 
 
 /** @type {import('./$types').PageServerLoad} */
-export async function load({ locals }) {
-  let result = await getPosts(locals.sql);
+export async function load({ locals, url }) {
+  const result = await getPosts(locals.sql, undefined, 10, 0, true);
+
+  // const glance = url.searchParams.get('glance');
+  // const glanceID = glance ? parseInt(glance) : null
+
+  // let postMetrics = null;
+  // if (glanceID) {
+  //   postMetrics = await getPostMetricsForPostId(glanceID);
+  // }
+
+  console.log(result);
 
   return {
     posts: result
diff --git a/src/routes/(app)/posts/+page.svelte b/src/routes/(app)/posts/+page.svelte
index 8ddc015..5974cbe 100644
--- a/src/routes/(app)/posts/+page.svelte
+++ b/src/routes/(app)/posts/+page.svelte
@@ -2,7 +2,9 @@
   import Postlist from "$comp/postlist.svelte";
 
   /**
-   * @type {{posts: import("$types/base").Post[]}}
+   * @type {{
+   *  posts: import("$types/base").Post[]
+   * }}
    */
   export let data;
 </script>
diff --git a/src/routes/(app)/posts/[name]/+page.server.js b/src/routes/(app)/posts/[name]/+page.server.js
index 3231980..1118fc5 100644
--- a/src/routes/(app)/posts/[name]/+page.server.js
+++ b/src/routes/(app)/posts/[name]/+page.server.js
@@ -1,6 +1,5 @@
 import { getCommentsForPost } from "$lib/server/db/comment";
 import { getPost } from "$lib/server/db/post";
-import { getPostMetrics } from "$lib/server/db/postmertics";
 import { getIdFromName } from "$lib/util";
 import { error } from "@sveltejs/kit";
 
@@ -16,8 +15,6 @@ export async function load({ params, locals }) {
 
   const comments = await getCommentsForPost(locals.sql, post_id);
 
-  console.log(await getPostMetrics(post));
-
   return {
     post: post,
     comments: comments
diff --git a/src/types/base.ts b/src/types/base.ts
index d13548b..1126462 100644
--- a/src/types/base.ts
+++ b/src/types/base.ts
@@ -3,19 +3,28 @@ export type Result<T> = Map<number, T>;
 export type User = {
   id: number,
   name: string,
-  joinDate: Date
+  joinDate: Date,
 };
 
 export type Rating = {
   likes: bigint,
-  dislikes: bigint
+  dislikes: bigint,
 }
 
 export type Category = {
   id: number,
-  name: string
+  name: string,
 }
 
+export type PostMetrics = {
+  commentCount: bigint,
+  userCount: bigint,
+  latestActivity: Date,
+  engagement: bigint,
+  age: number,
+  relevancy: number,
+};
+
 export type Post = {
   id: number,
   author: User | null,
@@ -23,7 +32,8 @@ export type Post = {
   category: Category,
   content: string,
   postDate: Date,
-  rating: Rating
+  rating: Rating,
+  metrics: PostMetrics | null,
 };
 
 export type Comment = {
@@ -32,23 +42,10 @@ export type Comment = {
   content: string,
   commentDate: Date,
   rating: Rating,
-  parentCommentId: number
+  parentCommentId: number,
 };
 
 export type CommentTreeNode = {
   parent: Comment,
-  children: (CommentTreeNode | number)[]
-};
-
-export type PostMetrics = {
-  post: Post,
-  commentCount: bigint,
-  userCount: bigint,
-  latestActivity: Date,
-  rating: Rating,
-  score: bigint,
-
-  engagement: bigint,
-  age: number,
-  relevancy: number
+  children: (CommentTreeNode | number)[],
 };