Merge remote-tracking branch 'origin/main' into release

Author: AndrewG828

src/api/controllers/ChatController.ts

@@ -232,7 +232,7 @@ export class ChatController {
 
           try {
             const result = await queryRunner.query(`
-              INSERT INTO "Transaction" (location, amount, completed, post_id, buyer_id, seller_id, "transactionDate", "confirmationSent")
+              INSERT INTO "Transaction" (location, amount, completed, "postId", "buyerId", "sellerId", "transactionDate", "confirmationSent")
               VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
               RETURNING id
             `, ["", amount, false, post.id, buyer.firebaseUid, seller.firebaseUid, transactionDate, false]);

src/repositories/PostRepository.ts

@@ -509,23 +509,69 @@ export class PostRepository extends AbstractRepository<PostModel> {
       .getOne();
   }
 
+  /**
+   * Fallback when no embedding-similar posts exist: returns other active posts
+   * (excluding this post, and excluding same user). Ordered by newest first.
+   */
+  public async getSimilarPostsFallback(
+    excludePostId: string,
+    excludeUserId: string,
+    limit: number,
+  ): Promise<PostModel[]> {
+    return await this.repository
+      .createQueryBuilder("post")
+      .leftJoinAndSelect("post.user", "user")
+      .where("post.id != :excludePostId", { excludePostId })
+      .andWhere("post.archive = false")
+      .andWhere("post.sold = false")
+      .andWhere("user.firebaseUid != :excludeUserId", { excludeUserId })
+      .orderBy("post.created", "DESC")
+      .limit(limit)
+      .getMany();
+  }
+
+  /**
+   * Fallback when even getSimilarPostsFallback is empty (e.g. only one user has posts):
+   * returns other active posts by any user, excluding only this post.
+   */
+  public async getSimilarPostsFallbackIncludeSameUser(
+    excludePostId: string,
+    limit: number,
+  ): Promise<PostModel[]> {
+    return await this.repository
+      .createQueryBuilder("post")
+      .leftJoinAndSelect("post.user", "user")
+      .where("post.id != :excludePostId", { excludePostId })
+      .andWhere("post.archive = false")
+      .andWhere("post.sold = false")
+      .orderBy("post.created", "DESC")
+      .limit(limit)
+      .getMany();
+  }
+
   /*
   This method is for getting similar posts for a given post query embedding.
+  Only returns active, non-archived, unsold posts with embeddings.
+  Fetches extra candidates so that after filtering (inactive users, blocked users)
+  we still have at least a few results.
   */
   public async getSimilarPosts(
     queryEmbedding: number[],
     excludePostId: string,
     excludeUserId: string,
+    limit = 20,
   ): Promise<PostModel[]> {
     const lit = `[${queryEmbedding.join(",")}]`;
     return await this.repository
       .createQueryBuilder("post")
       .leftJoinAndSelect("post.user", "user")
       .where("post.id != :excludePostId", { excludePostId })
+      .andWhere("post.embedding IS NOT NULL")
+      .andWhere("post.archive = false")
+      .andWhere("post.sold = false")
       .andWhere("user.firebaseUid != :excludeUserId", { excludeUserId })
-      .orderBy(`embedding::vector <-> CAST('${lit}' AS vector(512))`)
-      .setParameters({ embedding: queryEmbedding })
-      .limit(10)
+      .orderBy(`post.embedding::vector <-> CAST('${lit}' AS vector(512))`)
+      .limit(limit)
       .getMany();
   }
 

src/services/PostService.ts

@@ -570,22 +570,71 @@ export class PostService {
     });
   }
 
+  /**
+   * Returns the 4 closest similar posts by embedding (active, unsold only).
+   * If no similar posts (e.g. few posts, or only current user's posts), returns
+   * up to 4 other active posts as a fallback so the UI isn't empty.
+   */
   public async similarPosts(
     user: UserModel,
     params: UuidParam,
   ): Promise<PostModel[]> {
+    const SIMILAR_COUNT = 4;
     return this.transactions.readOnly(async (transactionalEntityManager) => {
       const postRepository = Repositories.post(transactionalEntityManager);
       const post = await postRepository.getPostById(params.id);
-      if (!post) throw new NotFoundError('Post not found!');
-      
-      // Posts with no embeddings cant have similar posts, so return empty array
-      if (post.embedding == null) {
-        return [];
+      if (!post) throw new NotFoundError("Post not found!");
+      const embedding = post.embedding;
+
+      if (embedding == null) {
+        let fallback = await postRepository.getSimilarPostsFallback(
+          post.id,
+          user.firebaseUid,
+          SIMILAR_COUNT,
+        );
+        if (fallback.length === 0) {
+          fallback = await postRepository.getSimilarPostsFallbackIncludeSameUser(
+            post.id,
+            SIMILAR_COUNT,
+          );
+        }
+        const active = this.filterInactiveUserPosts(fallback);
+        return (await this.filterBlockedUserPosts(active, user)).slice(
+          0,
+          SIMILAR_COUNT,
+        );
       }
-      const similarPosts = await postRepository.getSimilarPosts(post.embedding, post.id, user.firebaseUid);
+
+      const similarPosts = await postRepository.getSimilarPosts(
+        embedding,
+        post.id,
+        user.firebaseUid,
+        20,
+      );
       const activePosts = this.filterInactiveUserPosts(similarPosts);
-      return this.filterBlockedUserPosts(activePosts, user);
+      const filtered = await this.filterBlockedUserPosts(activePosts, user);
+      const result = filtered.slice(0, SIMILAR_COUNT);
+
+      if (result.length === 0) {
+        let fallback = await postRepository.getSimilarPostsFallback(
+          post.id,
+          user.firebaseUid,
+          SIMILAR_COUNT,
+        );
+        if (fallback.length === 0) {
+          fallback = await postRepository.getSimilarPostsFallbackIncludeSameUser(
+            post.id,
+            SIMILAR_COUNT,
+          );
+        }
+        const active = this.filterInactiveUserPosts(fallback);
+        return (await this.filterBlockedUserPosts(active, user)).slice(
+          0,
+          SIMILAR_COUNT,
+        );
+      }
+
+      return result;
     });
   }