hotfix: edit-ranking-order

Author: JGoo99

src/domain/couple/constant/score-query.helper.ts

@@ -1,18 +1,21 @@
 import { DataSource } from 'typeorm';
 import { EcoVerificationStatus } from '../../member/constants/eco-verification.status.enum';
 
+/* 가중치 기본값 : 누적♥ 1  |  평균♥ 0.3  */
 export interface EcoScoreWeights {
-  cum: number; // 누적♥ 가중치 (기본 1)
-  avg: number; // 평균♥ 가중치 (기본 0.3)
+  cum: number;
+  avg: number;
 }
 
-/** 커플별 누적♥·인증횟수·평균♥ 집계 */
+/* ───────────────────────────────────────────────
+   1) 커플별 누적♥·인증횟수·평균♥ 집계 서브쿼리
+   ─────────────────────────────────────────────── */
 export function coupleStatsSubQuery(ds: DataSource) {
   return ds
     .createQueryBuilder()
     .select([
-      'c.id   AS coupleId',
-      'c.createdAt AS createdAt',
+      'c.id                     AS coupleId',
+      'c.createdAt              AS createdAt',
       'c.cumulativeEcoLovePoints AS cumHeart',
     ])
     .from('couple', 'c')
@@ -32,12 +35,17 @@ export function coupleStatsSubQuery(ds: DataSource) {
     )
     .addSelect('COALESCE(a.ecoCnt,0)', 'ecoCnt')
     .addSelect(
-      `CASE WHEN COALESCE(a.ecoCnt,0)=0 THEN 0
-            ELSE c.cumulativeEcoLovePoints / a.ecoCnt END`,
+      `CASE
+         WHEN COALESCE(a.ecoCnt,0)=0 THEN 0
+         ELSE c.cumulativeEcoLovePoints / a.ecoCnt
+       END`,
       'avgHeart',
     );
 }
 
+/* ───────────────────────────────────────────────
+   2) ecoScore(절대값) + ranking 을 추가한 공통 QB
+   ─────────────────────────────────────────────── */
 export function coupleScoreQB(
   ds: DataSource,
   weights: EcoScoreWeights = { cum: 1, avg: 0.3 },
@@ -55,8 +63,9 @@ export function coupleScoreQB(
       'b.cumHeart                AS cumulativeEcoLovePoints',
       'b.ecoCnt                  AS ecoVerificationCount',
     ])
+    /* ecoScore = 누적♥ * 1 + 평균♥ * 0.3 (소수점 버림) */
     .addSelect(`FLOOR(b.cumHeart * :cumW + b.avgHeart * :avgW)`, 'ecoScore')
-    /* 랭킹: ecoScore ↓ → 인증횟수 ↓ → 결성일 ↑ */
+    /* ranking : ecoScore ↓ → 인증횟수 ↓ → 결성일 ↑ */
     .addSelect(
       `RANK() OVER (
          ORDER BY

src/domain/couple/couple-ranking.service.ts

@@ -1,55 +1,52 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { DataSource, Repository } from 'typeorm';
+import { In, Not, Repository } from 'typeorm';
 import { Couple } from './entities/couple.entity';
-import { PaginatedDto } from '../../common/dto/paginated.dto';
 import { RankingDto } from './dto/ranking.dto';
 import { IGNORE_COUPLE_IDS } from '../eco-verification/constant/ignore-couple-ids';
 import { coupleScoreQB } from './constant/score-query.helper';
+import { PaginatedDto } from '../../common/dto/paginated.dto';
 
 @Injectable()
 export class CoupleRankingService {
   constructor(
     @InjectRepository(Couple) private coupleRepo: Repository<Couple>,
-    private readonly dataSource: DataSource,
   ) {}
 
+  /* ---------------- 랭킹 리스트 ---------------- */
   async getRankings(page = 1, limit = 30): Promise<PaginatedDto<RankingDto>> {
     const offset = (page - 1) * limit;
 
     const qb = coupleScoreQB(
-      this.dataSource,
-      { cum: 700, avg: 300 },
+      this.coupleRepo.manager.connection,
+      { cum: 1, avg: 0.3 },
       IGNORE_COUPLE_IDS,
     )
-      .orderBy('ecoScore', 'DESC') // 이미 윈도 함수 기준으로 맞춤
-      .addOrderBy('b.ecoCnt', 'DESC')
-      .addOrderBy('b.createdAt', 'ASC')
+      .orderBy('ecoScore', 'DESC')
+      .addOrderBy('ecoVerificationCount', 'DESC')
+      .addOrderBy('createdAt', 'ASC')
       .offset(offset)
       .limit(limit);
 
     const [rows, total] = await Promise.all([
       qb.getRawMany<RankingDto>(),
-      (() => {
-        const cntQb = this.coupleRepo.createQueryBuilder('c');
-        if (IGNORE_COUPLE_IDS.length) {
-          cntQb.where('c.id NOT IN (:...excludeIds)', {
-            excludeIds: IGNORE_COUPLE_IDS,
-          });
-        }
-        return cntQb.getCount();
-      })(),
+      this.coupleRepo.count({
+        where: { id: Not(In(IGNORE_COUPLE_IDS)) },
+      }),
     ]);
 
-    const results: RankingDto[] = rows.map((r) => ({
-      coupleId: r.coupleId,
-      name: r.name,
-      profileImageUrl: r.profileImageUrl,
-      ecoScore: Number(r.ecoScore),
-      cumulativeEcoLovePoints: Number(r.cumulativeEcoLovePoints),
-      ecoVerificationCount: Number(r.ecoVerificationCount),
-    }));
-
-    return { results, total, limit, page };
+    return {
+      results: rows.map((r) => ({
+        coupleId: r.coupleId,
+        name: r.name,
+        profileImageUrl: r.profileImageUrl,
+        ecoScore: Number(r.ecoScore),
+        cumulativeEcoLovePoints: Number(r.cumulativeEcoLovePoints),
+        ecoVerificationCount: Number(r.ecoVerificationCount),
+      })),
+      total,
+      limit,
+      page,
+    };
   }
 }

src/domain/couple/couple.service.ts

@@ -152,8 +152,8 @@ export class CoupleService {
     if (!couple) return null;
 
     const row = await coupleScoreQB(
-      this.dataSource,
-      { cum: 700, avg: 300 },
+      this.coupleRepo.manager.connection,
+      { cum: 1, avg: 0.3 },
       IGNORE_COUPLE_IDS,
     )
       .andWhere('b.coupleId = :cid', { cid })
@@ -164,7 +164,7 @@ export class CoupleService {
         ecoVerificationCount: number;
       }>();
 
-    if (!row) return null;
+    if (!row) return null; // ignore 리스트에 속할 때
 
     const remainingDays = Math.max(
       dayjs(couple.breakupAt).diff(dayjs(tz().format('YYYY-MM-DD')), 'day'),