feat: 잔디 심는 로직 변경 (광클 시 무한대로 쌓이는 잔디 버그 해결)

Author: moo1677

components/heatmap/GrassHeatmap.tsx

@@ -27,7 +27,7 @@ export default function GrassHeatmap({ uid }: Props) {
   }, [endDate]);
 
   const [values, setValues] = useState<
-    { date: string; total: number; tilCount?: number; todoDoneCount?: number }[]
+    { date: string; total: number; tilCount?: number; planDoneCount?: number }[]
   >([]);
 
   useEffect(() => {
@@ -41,12 +41,12 @@ export default function GrassHeatmap({ uid }: Props) {
   const byDate = useMemo(() => {
     const m = new Map<
       string,
-      { tilCount: number; todoDoneCount: number; total: number }
+      { tilCount: number; planDoneCount: number; total: number }
     >();
     for (const s of values) {
       m.set(s.date, {
         tilCount: s.tilCount ?? 0,
-        todoDoneCount: s.todoDoneCount ?? 0,
+        planDoneCount: s.planDoneCount ?? 0,
         total: s.total ?? 0,
       });
     }
@@ -81,7 +81,7 @@ export default function GrassHeatmap({ uid }: Props) {
               const d = byDate.get(value.date);
 
               const til = d?.tilCount ?? 0;
-              const todo = d?.todoDoneCount ?? 0;
+              const todo = d?.planDoneCount ?? 0;
               const total = d?.total ?? 0;
 
               return {

services/heatmap/dailyStat.service.ts

@@ -1,80 +1,79 @@
 import {
   doc,
-  runTransaction,
-  serverTimestamp,
+  setDoc,
   collection,
   getDocs,
   query,
   where,
+  serverTimestamp,
   orderBy,
   getDoc,
+  Timestamp,
 } from 'firebase/firestore';
 import { db } from '@/lib/firebase';
 
 export interface DailyStat {
   date: string; // YYYY-MM-DD
-  total: number;
-}
-
-export type DailyStatDetail = {
-  date: string;
   tilCount: number;
-  todoDoneCount: number;
+  planDoneCount: number;
   total: number;
-};
+  updatedAt?: Timestamp;
+}
 
 function dateKeyKST(date = new Date()) {
   const kst = new Date(date.getTime() + 9 * 60 * 60 * 1000);
   return kst.toISOString().slice(0, 10);
 }
 
-export const bumpDailyStat = async (
-  uid: string,
-  deltaTil: number,
-  deltaTodoDone: number
-) => {
-  const key = dateKeyKST();
-  const ref = doc(db, `users/${uid}/dailyStats/${key}`);
-
-  await runTransaction(db, async (tx) => {
-    const snap = await tx.get(ref);
-
-    const prev = snap.exists()
-      ? (snap.data() as {
-          tilCount?: number;
-          todoDoneCount?: number;
-          total?: number;
-        })
-      : {};
-
-    const nextTil = Math.max(0, (prev.tilCount ?? 0) + deltaTil);
-    const nextTodo = Math.max(0, (prev.todoDoneCount ?? 0) + deltaTodoDone);
-    const nextTotal = Math.max(0, nextTil + nextTodo);
-
-    tx.set(
-      ref,
-      {
-        date: key,
-        tilCount: nextTil,
-        todoDoneCount: nextTodo,
-        total: nextTotal,
-        updatedAt: serverTimestamp(),
-      },
-      { merge: true }
-    );
-  });
+const formatDate = (d: string | Date | undefined) => {
+  if (!d) return '';
+  if (typeof d === 'string') return d;
+  return d.toISOString().split('T')[0]; // YYYY-MM-DD 형식
+};
+
+export const recomputeDailyStat = async (uid: string) => {
+  const dateKey = dateKeyKST();
+
+  /** 1. 오늘 완료된 planItems */
+
+  const planItemsRef = collection(db, 'users', uid, 'planItems');
+  const planQuery = query(
+    planItemsRef,
+    where('dateKey', '==', dateKey),
+    where('isChecked', '==', true)
+  );
+  const planSnap = await getDocs(planQuery);
+  const planDoneCount = planSnap.size;
+
+  /** 2. 오늘 작성한 TIL */
+  const tilRef = collection(db, 'users', uid, 'tils');
+  const tilQuery = query(tilRef, where('dateKey', '==', dateKey));
+  const tilSnap = await getDocs(tilQuery);
+  const tilCount = tilSnap.size;
+
+  /** 3. DailyStat 덮어쓰기 */
+  const ref = doc(db, 'users', uid, 'dailyStats', dateKey);
+
+  await setDoc(
+    ref,
+    {
+      date: dateKey,
+      tilCount,
+      planDoneCount,
+      total: tilCount + planDoneCount,
+      updatedAt: serverTimestamp(),
+    },
+    { merge: true }
+  );
 };
 
 export const fetchDailyStats = async (uid: string): Promise<DailyStat[]> => {
   const colRef = collection(db, 'users', uid, 'dailyStats');
 
-  const endDate = dateKeyKST(new Date());
-  const startDate = (() => {
-    const d = new Date();
-    d.setFullYear(d.getFullYear() - 1);
-    d.setDate(d.getDate() + 1);
-    return dateKeyKST(d);
-  })();
+  const endDate = dateKeyKST();
+  const start = new Date();
+  start.setFullYear(start.getFullYear() - 1);
+  const startDate = dateKeyKST(start);
 
   const q = query(
     colRef,
@@ -85,21 +84,18 @@ export const fetchDailyStats = async (uid: string): Promise<DailyStat[]> => {
 
   const snap = await getDocs(q);
 
-  return snap.docs.map((doc) => {
-    const data = doc.data();
-    return {
-      date: data.date,
-      tilCount: data.tilCount ?? 0,
-      todoDoneCount: data.todoDoneCount ?? 0,
-      total: data.total ?? 0,
-    };
-  });
+  return snap.docs.map((d) => ({
+    date: d.data().date,
+    tilCount: d.data().tilCount ?? 0,
+    planDoneCount: d.data().planDoneCount ?? 0,
+    total: d.data().total ?? 0,
+  }));
 };
 
 export const fetchDailyStatByDate = async (
   uid: string,
-  date: string // YYYY-MM-DD
-): Promise<DailyStatDetail | null> => {
+  date: string
+): Promise<DailyStat | null> => {
   const ref = doc(db, 'users', uid, 'dailyStats', date);
   const snap = await getDoc(ref);
 
@@ -109,7 +105,7 @@ export const fetchDailyStatByDate = async (
   return {
     date: data.date,
     tilCount: data.tilCount ?? 0,
-    todoDoneCount: data.todoDoneCount ?? 0,
+    planDoneCount: data.planDoneCount ?? 0,
     total: data.total ?? 0,
   };
 };

services/plans/planManageService.service.ts

@@ -12,7 +12,7 @@ import {
   writeBatch,
 } from 'firebase/firestore';
 import { db } from '@/lib/firebase';
-import { bumpDailyStat } from '@/services/heatmap/dailyStat.service';
+import { recomputeDailyStat } from '@/services/heatmap/dailyStat.service';
 
 // 플랜 데이터 타입
 export interface Plan {
@@ -30,6 +30,11 @@ export interface PlanItem {
   isChecked: boolean;
   deadline: Date;
   createdAt: Date;
+  dateKey?: string;
+}
+function dateKeyKST(date = new Date()) {
+  const kst = new Date(date.getTime() + 9 * 60 * 60 * 1000);
+  return kst.toISOString().slice(0, 10);
 }
 
 // 1. 플랜 생성하기
@@ -99,6 +104,7 @@ export const addPlanItem = async (
     isChecked: false,
     deadline: deadline ? Timestamp.fromDate(deadline) : null,
     createdAt: Timestamp.now(),
+    dateKey: deadline ? dateKeyKST(deadline) : null,
   });
 };
 
@@ -112,8 +118,7 @@ export const toggleItemStatus = async (
   await updateDoc(itemRef, {
     isChecked: !currentStatus,
   });
-  const delta = !currentStatus ? 1 : -1;
-  await bumpDailyStat(uid, 0, delta);
+  await recomputeDailyStat(uid);
 };
 
 // 6. 플랜 삭제
@@ -153,6 +158,7 @@ export const updatePlanItem = async (
     text?: string; // 수정할 제목
     description?: string; // 수정할 설명
     deadline?: Date | null; // 수정할 마감일 (null이면 마감일 삭제)
+    dateKey?: string;
   }
 ) => {
   const itemRef = doc(db, 'users', uid, 'planItems', itemId);
@@ -162,6 +168,7 @@ export const updatePlanItem = async (
     text?: string;
     description?: string;
     deadline?: Timestamp | null;
+    dateKey?: string | null;
   } = {};
 
   // 1. 제목이 전달되었으면 업데이트 목록에 추가
@@ -179,6 +186,9 @@ export const updatePlanItem = async (
     updatePayload.deadline = updates.deadline
       ? Timestamp.fromDate(updates.deadline)
       : null; // null을 넘기면 DB에서 마감일이 사라짐
+    updatePayload.dateKey = updates.deadline
+      ? dateKeyKST(updates.deadline)
+      : null;
   }
 
   // 변경사항이 있을 때만 DB 요청

services/write/til.service.ts

@@ -10,13 +10,19 @@ import {
   getCountFromServer,
 } from 'firebase/firestore';
 import { db } from '@/lib/firebase';
-import { bumpDailyStat } from '@/services/heatmap/dailyStat.service';
+import { recomputeDailyStat } from '@/services/heatmap/dailyStat.service';
+
+function dateKeyKST(date = new Date()) {
+  const kst = new Date(date.getTime() + 9 * 60 * 60 * 1000);
+  return kst.toISOString().slice(0, 10);
+}
 
 export type TilData = {
   title: string;
   content: string;
   createdAt: Timestamp | null;
   updatedAt: Timestamp | null;
+  dateKey: string;
 };
 
 export type Til = TilData & { id: string };
@@ -26,10 +32,11 @@ export async function createTil(uid: string, content: string, title: string) {
   const docRef = await addDoc(tilsCol, {
     title: title,
     content,
+    dateKey: dateKeyKST(),
     createdAt: serverTimestamp(),
     updatedAt: serverTimestamp(),
   });
-  await bumpDailyStat(uid, 1, 0);
+  await recomputeDailyStat(uid);
   await fetchTilCount(uid);
   return docRef.id;
 }
@@ -48,11 +55,13 @@ const parseTilData = (raw: unknown): TilData | null => {
   const title = raw.title;
   if (typeof title !== 'string') return null;
 
-  const createdAt = raw.createdAt instanceof Timestamp ? raw.createdAt : null;
+  const dateKey = raw.dateKey;
+  if (typeof dateKey !== 'string') return null;
 
+  const createdAt = raw.createdAt instanceof Timestamp ? raw.createdAt : null;
   const updatedAt = raw.updatedAt instanceof Timestamp ? raw.updatedAt : null;
 
-  return { title, content, createdAt, updatedAt };
+  return { title, content, dateKey, createdAt, updatedAt };
 };
 
 export const fetchMyTil = async (
@@ -89,6 +98,7 @@ export const updateTil = async (
 
 export const deleteTil = async (uid: string, tilId: string) => {
   await deleteDoc(doc(db, 'users', uid, 'tils', tilId));
+  await recomputeDailyStat(uid);
   await fetchTilCount(uid);
 };
 

types/til.ts

@@ -12,4 +12,5 @@ export type TilDoc = {
   content: string;
   createdAt: Timestamp;
   updatedAt: Timestamp;
+  dateKey: string;
 };