Fix/hashtag count (#187)

AmiraKhalid04 · MarioRaafat · web-flow · commit 035ea10baf82 · 2025-12-13T17:14:15.000+02:00
* fix(hashtags): remove created by column

* feat(hashtag): add tweet hashtag entity

* feat(trend): disable fake trends for now

* feat(hashtags): add trigger for hashtag count

* feat(hashtags): extract hashtags from quotes and replies

* fix(db): remove view migrations

* fix(db): copy  migrations file to database folder

* test(hashtag): fix unit tests

---------

Co-authored-by: Mario Raafat &lt;136023677+MarioRaafat@users.noreply.github.com&gt;
diff --git a/src/databases/data-source.ts b/src/databases/data-source.ts
@@ -23,6 +23,7 @@ import { Chat } from '../chat/entities/chat.entity';
 import { Message } from '../messages/entities/message.entity';
 import { MessageReaction } from '../messages/entities/message-reaction.entity';
 import { readFileSync } from 'fs';
+import { TweetHashtag } from '../tweets/entities/tweet-hashtag.entity';
 
 config({ path: resolve(__dirname, '../../config/.env') });
 
@@ -76,6 +77,7 @@ const base_config: any = {
         Message,
         MessageReaction,
         TweetSummary,
+        TweetHashtag,
     ],
 
     migrations: [__dirname + '/../migrations/*{.ts,.js}'],
diff --git a/src/databases/migrations/1765394569999-CreateHashtagCleanupTrigger.ts b/src/databases/migrations/1765394569999-CreateHashtagCleanupTrigger.ts
@@ -0,0 +1,48 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class CreateHashtagCleanupTrigger1765394569999 implements MigrationInterface {
+    public async up(query_runner: QueryRunner): Promise<void> {
+        // Create function to cleanup hashtags when tweet is deleted
+        await query_runner.query(`
+            CREATE OR REPLACE FUNCTION cleanup_hashtags_on_tweet_delete()
+            RETURNS TRIGGER AS $$
+            BEGIN
+                -- Decrement usage_count for all hashtags associated with the deleted tweet
+                UPDATE hashtag
+                SET usage_count = usage_count - 1
+                WHERE name IN (
+                    SELECT hashtag_name 
+                    FROM tweet_hashtags 
+                    WHERE tweet_id = OLD.tweet_id
+                );
+
+                -- Delete hashtags with usage_count <= 0
+                DELETE FROM hashtag 
+                WHERE usage_count <= 0;
+
+                RETURN OLD;
+            END;
+            $$ LANGUAGE plpgsql;
+        `);
+
+        // Create trigger that fires BEFORE DELETE on tweet table
+        await query_runner.query(`
+            CREATE TRIGGER tweet_delete_hashtag_cleanup_trigger
+            BEFORE DELETE ON "tweets"
+            FOR EACH ROW
+            EXECUTE FUNCTION cleanup_hashtags_on_tweet_delete();
+        `);
+    }
+
+    public async down(query_runner: QueryRunner): Promise<void> {
+        // Drop trigger
+        await query_runner.query(`
+            DROP TRIGGER IF EXISTS tweet_delete_hashtag_cleanup_trigger ON "tweets"
+        `);
+
+        // Drop function
+        await query_runner.query(`
+            DROP FUNCTION IF EXISTS cleanup_hashtags_on_tweet_delete()
+        `);
+    }
+}
diff --git a/src/databases/migrations/1765557470457-removeCreatedBy.ts b/src/databases/migrations/1765557470457-removeCreatedBy.ts
@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveCreatedBy1765557470457 implements MigrationInterface {
+    name = 'RemoveCreatedBy1765557470457';
+
+    public async up(query_runner: QueryRunner): Promise<void> {
+        await query_runner.query(
+            `ALTER TABLE "hashtag" DROP CONSTRAINT "FK_11c8b3519f62b36dd5385c217d3"`
+        );
+
+        await query_runner.query(`ALTER TABLE "hashtag" DROP COLUMN "created_by"`);
+    }
+
+    public async down(query_runner: QueryRunner): Promise<void> {
+        await query_runner.query(`ALTER TABLE "hashtag" ADD "created_by" uuid`);
+
+        await query_runner.query(
+            `ALTER TABLE "hashtag" ADD CONSTRAINT "FK_11c8b3519f62b36dd5385c217d3" FOREIGN KEY ("created_by") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`
+        );
+    }
+}
diff --git a/src/databases/migrations/1765585636405-TweetHashtagEntity.ts b/src/databases/migrations/1765585636405-TweetHashtagEntity.ts
@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class TweetHashtagEntity1765585636405 implements MigrationInterface {
+    name = 'TweetHashtagEntity1765585636405';
+
+    public async up(query_runner: QueryRunner): Promise<void> {
+        await query_runner.query(
+            `CREATE TABLE "tweet_hashtags" ("tweet_id" uuid NOT NULL, "hashtag_name" character varying NOT NULL, CONSTRAINT "PK_42219b0e52e3bee49d2772b3a54" PRIMARY KEY ("tweet_id", "hashtag_name"))`
+        );
+
+        await query_runner.query(
+            `ALTER TABLE "tweet_hashtags" ADD CONSTRAINT "FK_efe191c9c3d1359e60bac167736" FOREIGN KEY ("tweet_id") REFERENCES "tweets"("tweet_id") ON DELETE CASCADE ON UPDATE NO ACTION`
+        );
+        await query_runner.query(
+            `ALTER TABLE "tweet_hashtags" ADD CONSTRAINT "FK_b0a40275de4a8088c5e6426419d" FOREIGN KEY ("hashtag_name") REFERENCES "hashtag"("name") ON DELETE CASCADE ON UPDATE NO ACTION`
+        );
+    }
+
+    public async down(query_runner: QueryRunner): Promise<void> {
+        await query_runner.query(
+            `ALTER TABLE "tweet_hashtags" DROP CONSTRAINT "FK_b0a40275de4a8088c5e6426419d"`
+        );
+        await query_runner.query(
+            `ALTER TABLE "tweet_hashtags" DROP CONSTRAINT "FK_efe191c9c3d1359e60bac167736"`
+        );
+
+        await query_runner.query(`DROP TABLE "tweet_hashtags"`);
+    }
+}
diff --git a/src/migrations/1765394569999-CreateHashtagCleanupTrigger.ts b/src/migrations/1765394569999-CreateHashtagCleanupTrigger.ts
@@ -0,0 +1,48 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class CreateHashtagCleanupTrigger1765394569999 implements MigrationInterface {
+    public async up(query_runner: QueryRunner): Promise<void> {
+        // Create function to cleanup hashtags when tweet is deleted
+        await query_runner.query(`
+            CREATE OR REPLACE FUNCTION cleanup_hashtags_on_tweet_delete()
+            RETURNS TRIGGER AS $$
+            BEGIN
+                -- Decrement usage_count for all hashtags associated with the deleted tweet
+                UPDATE hashtag
+                SET usage_count = usage_count - 1
+                WHERE name IN (
+                    SELECT hashtag_name 
+                    FROM tweet_hashtags 
+                    WHERE tweet_id = OLD.tweet_id
+                );
+
+                -- Delete hashtags with usage_count <= 0
+                DELETE FROM hashtag 
+                WHERE usage_count <= 0;
+
+                RETURN OLD;
+            END;
+            $$ LANGUAGE plpgsql;
+        `);
+
+        // Create trigger that fires BEFORE DELETE on tweet table
+        await query_runner.query(`
+            CREATE TRIGGER tweet_delete_hashtag_cleanup_trigger
+            BEFORE DELETE ON "tweets"
+            FOR EACH ROW
+            EXECUTE FUNCTION cleanup_hashtags_on_tweet_delete();
+        `);
+    }
+
+    public async down(query_runner: QueryRunner): Promise<void> {
+        // Drop trigger
+        await query_runner.query(`
+            DROP TRIGGER IF EXISTS tweet_delete_hashtag_cleanup_trigger ON "tweets"
+        `);
+
+        // Drop function
+        await query_runner.query(`
+            DROP FUNCTION IF EXISTS cleanup_hashtags_on_tweet_delete()
+        `);
+    }
+}
diff --git a/src/migrations/1765557470457-removeCreatedBy.ts b/src/migrations/1765557470457-removeCreatedBy.ts
@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveCreatedBy1765557470457 implements MigrationInterface {
+    name = 'RemoveCreatedBy1765557470457';
+
+    public async up(query_runner: QueryRunner): Promise<void> {
+        await query_runner.query(
+            `ALTER TABLE "hashtag" DROP CONSTRAINT "FK_11c8b3519f62b36dd5385c217d3"`
+        );
+
+        await query_runner.query(`ALTER TABLE "hashtag" DROP COLUMN "created_by"`);
+    }
+
+    public async down(query_runner: QueryRunner): Promise<void> {
+        await query_runner.query(`ALTER TABLE "hashtag" ADD "created_by" uuid`);
+
+        await query_runner.query(
+            `ALTER TABLE "hashtag" ADD CONSTRAINT "FK_11c8b3519f62b36dd5385c217d3" FOREIGN KEY ("created_by") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`
+        );
+    }
+}
diff --git a/src/migrations/1765585636405-TweetHashtagEntity.ts b/src/migrations/1765585636405-TweetHashtagEntity.ts
@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class TweetHashtagEntity1765585636405 implements MigrationInterface {
+    name = 'TweetHashtagEntity1765585636405';
+
+    public async up(query_runner: QueryRunner): Promise<void> {
+        await query_runner.query(
+            `CREATE TABLE "tweet_hashtags" ("tweet_id" uuid NOT NULL, "hashtag_name" character varying NOT NULL, CONSTRAINT "PK_42219b0e52e3bee49d2772b3a54" PRIMARY KEY ("tweet_id", "hashtag_name"))`
+        );
+
+        await query_runner.query(
+            `ALTER TABLE "tweet_hashtags" ADD CONSTRAINT "FK_efe191c9c3d1359e60bac167736" FOREIGN KEY ("tweet_id") REFERENCES "tweets"("tweet_id") ON DELETE CASCADE ON UPDATE NO ACTION`
+        );
+        await query_runner.query(
+            `ALTER TABLE "tweet_hashtags" ADD CONSTRAINT "FK_b0a40275de4a8088c5e6426419d" FOREIGN KEY ("hashtag_name") REFERENCES "hashtag"("name") ON DELETE CASCADE ON UPDATE NO ACTION`
+        );
+    }
+
+    public async down(query_runner: QueryRunner): Promise<void> {
+        await query_runner.query(
+            `ALTER TABLE "tweet_hashtags" DROP CONSTRAINT "FK_b0a40275de4a8088c5e6426419d"`
+        );
+        await query_runner.query(
+            `ALTER TABLE "tweet_hashtags" DROP CONSTRAINT "FK_efe191c9c3d1359e60bac167736"`
+        );
+
+        await query_runner.query(`DROP TABLE "tweet_hashtags"`);
+    }
+}
diff --git a/src/trend/fake-trend.service.ts b/src/trend/fake-trend.service.ts
@@ -25,10 +25,10 @@ export class FakeTrendService {
     ) {}
 
     // Every 20 minutes
-    @Cron('*/20 * * * *', {
-        name: 'fake-trends-job',
-        timeZone: 'UTC',
-    })
+    // @Cron('*/20 * * * *', {
+    //     name: 'fake-trends-job',
+    //     timeZone: 'UTC',
+    // })
     async fakeTrends(): Promise<void> {
         try {
             const trend_bot = await this.insertTrendBotIfNotExists();
diff --git a/src/tweets/entities/hashtags.entity.ts b/src/tweets/entities/hashtags.entity.ts
@@ -6,8 +6,10 @@ import {
     Entity,
     JoinColumn,
     ManyToOne,
+    OneToMany,
     PrimaryColumn,
 } from 'typeorm';
+import { TweetHashtag } from './tweet-hashtag.entity';
 
 @Entity('hashtag')
 export class Hashtag {
@@ -17,14 +19,13 @@ export class Hashtag {
     @Column({ type: 'int', default: 0 })
     usage_count: number;
 
-    @ManyToOne(() => User, (user) => user.hashtags, {})
-    @JoinColumn({ name: 'created_by', referencedColumnName: 'id' })
-    created_by: User;
-
     @CreateDateColumn({ type: 'timestamptz' })
     created_at: Date;
 
     // I guess we won't need this but just in case
     @DeleteDateColumn({ type: 'timestamptz' })
     deleted_at: Date;
+
+    @OneToMany(() => TweetHashtag, (tweet_hashtag) => tweet_hashtag.hashtag)
+    tweet_hashtags: TweetHashtag[];
 }
diff --git a/src/tweets/entities/tweet-hashtag.entity.ts b/src/tweets/entities/tweet-hashtag.entity.ts
@@ -0,0 +1,24 @@
+import { Entity, ForeignKey, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm';
+import { Tweet } from './tweet.entity';
+import { Hashtag } from './hashtags.entity';
+
+@Entity('tweet_hashtags')
+export class TweetHashtag {
+    @PrimaryColumn('uuid')
+    tweet_id: string;
+
+    @PrimaryColumn('varchar')
+    hashtag_name: string;
+
+    @ManyToOne(() => Tweet, (tweet) => tweet.tweet_hashtags, {
+        onDelete: 'CASCADE',
+    })
+    @JoinColumn({ name: 'tweet_id' })
+    tweet: Tweet;
+
+    @ManyToOne(() => Hashtag, (hashtag) => hashtag.tweet_hashtags, {
+        onDelete: 'CASCADE',
+    })
+    @JoinColumn({ name: 'hashtag_name' })
+    hashtag: Hashtag;
+}
diff --git a/src/tweets/entities/tweet.entity.ts b/src/tweets/entities/tweet.entity.ts
@@ -17,6 +17,7 @@ import { TweetQuote } from './tweet-quote.entity';
 import { TweetRepost } from './tweet-repost.entity';
 import { TweetReply } from './tweet-reply.entity';
 import { TweetBookmark } from './tweet-bookmark.entity';
+import { TweetHashtag } from './tweet-hashtag.entity';
 import { UserFollows } from '../../user/entities/user-follows.entity';
 import { TweetType } from '../../shared/enums/tweet-types.enum';
 import { TweetSummary } from './tweet-summary.entity';
@@ -104,6 +105,9 @@ export class Tweet {
     @OneToOne(() => TweetSummary, (summary) => summary.tweet, { onDelete: 'CASCADE' })
     summary: TweetSummary;
 
+    @OneToMany(() => TweetHashtag, (tweet_hashtag) => tweet_hashtag.tweet)
+    tweet_hashtags: TweetHashtag[];
+
     // Virtual fields for current user interactions (loaded via leftJoinAndMapOne in queries)
     current_user_like?: TweetLike | null;
     current_user_repost?: TweetRepost | null;
diff --git a/src/tweets/tweets.module.ts b/src/tweets/tweets.module.ts
@@ -5,6 +5,7 @@ import { TweetsService } from './tweets.service';
 import { TweetsRepository } from './tweets.repository';
 import { Tweet, TweetLike, TweetQuote, TweetReply, TweetRepost } from './entities';
 import { TweetBookmark } from './entities/tweet-bookmark.entity';
+import { TweetHashtag } from './entities/tweet-hashtag.entity';
 import { Hashtag } from './entities/hashtags.entity';
 import { UserFollows } from 'src/user/entities/user-follows.entity';
 import { PaginationService } from 'src/shared/services/pagination/pagination.service';
@@ -26,6 +27,7 @@ import { DeletedTweetsCleanupService, DeletedTweetsLog } from './deleted-tweets-
             TweetQuote,
             TweetReply,
             TweetBookmark,
+            TweetHashtag,
             Hashtag,
             UserFollows,
             UserPostsView,
diff --git a/src/tweets/tweets.service.spec.ts b/src/tweets/tweets.service.spec.ts
@@ -2225,9 +2225,6 @@ describe('TweetsService', () => {
             };
             const mock_user_id = 'user-123';
 
-            const mention_spy = jest
-                .spyOn(tweets_service as any, 'updateHashtags')
-                .mockResolvedValue(undefined);
             const topics_spy = jest
                 .spyOn(tweets_service as any, 'extractTopics')
                 .mockResolvedValue({
@@ -2248,7 +2245,6 @@ describe('TweetsService', () => {
                 mock_query_runner
             );
 
-            expect(mention_spy).toHaveBeenCalled();
             expect(topics_spy).toHaveBeenCalled();
             expect(result).toEqual({
                 mentioned_user_ids: ['user-id-1'],
@@ -2262,8 +2258,6 @@ describe('TweetsService', () => {
             };
             const mock_user_id = 'user-123';
 
-            const spy = jest.spyOn(tweets_service as any, 'mentionNotification');
-
             const result = await (tweets_service as any).extractDataFromTweets(
                 mock_tweet,
                 mock_user_id,
diff --git a/src/tweets/tweets.service.ts b/src/tweets/tweets.service.ts
diff --git a/src/user/entities/user.entity.ts b/src/user/entities/user.entity.ts
