Skip to content

[25.04.19 / TASK-157] Feature: 배치, soft delete 기능과 is active false 의 추가로 이에 모든 조건에 해당 조건 추가 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 24, 2025
Merged

[25.04.19 / TASK-157] Feature: 배치, soft delete 기능과 is active false 의 추가로 이에 모든 조건에 해당 조건 추가 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cb309f
feature: 배치, soft delete 기능과 is active false 의 추가로 이에 모든 조건에 해당 조건 추가
Nuung Apr 19, 2025
03525a0
modify: pg의 QueryResult 타입을 만족하는 mock 객체를 생성하기 위한 헬퍼 함수 생성
Nuung Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 78 additions & 64 deletions src/repositories/__test__/post.repo.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ import { DBError } from '@/exception';

jest.mock('pg');

// pg의 QueryResult 타입을 만족하는 mock 객체를 생성하기 위한 헬퍼 함수 생성
function createMockQueryResult<T extends Record<string, unknown>>(rows: T[]): QueryResult<T> {
return {
rows,
rowCount: rows.length,
command: '',
oid: 0,
fields: [],
} satisfies QueryResult<T>;
}

const mockPool: {
query: jest.Mock<Promise<QueryResult<Record<string, unknown>>>, unknown[]>;
} = {
Expand All @@ -15,6 +26,7 @@ describe('PostRepository', () => {

beforeEach(() => {
repo = new PostRepository(mockPool as unknown as Pool);
jest.clearAllMocks();
});

describe('findPostsByUserId', () => {
Expand All @@ -24,13 +36,7 @@ describe('PostRepository', () => {
{ id: 2, post_released_at: '2025-03-02T00:00:00Z', daily_view_count: 20, daily_like_count: 15 },
];

mockPool.query.mockResolvedValue({
rows: mockPosts,
rowCount: mockPosts.length,
command: '',
oid: 0,
fields: [],
} as QueryResult);
mockPool.query.mockResolvedValue(createMockQueryResult(mockPosts));

const result = await repo.findPostsByUserId(1, undefined, 'released_at', false);

Expand All @@ -44,18 +50,28 @@ describe('PostRepository', () => {
{ id: 1, post_released_at: '2025-03-01T00:00:00Z', daily_view_count: 10, daily_like_count: 5 },
];

mockPool.query.mockResolvedValue({
rows: mockPosts,
rowCount: mockPosts.length,
command: '',
oid: 0,
fields: [],
} as QueryResult);
mockPool.query.mockResolvedValue(createMockQueryResult(mockPosts));

const result = await repo.findPostsByUserId(1, undefined, 'released_at', false);
expect(result.posts).toEqual(mockPosts);
expect(result.posts[0].id).toBeGreaterThan(result.posts[1].id);
});

it('쿼리에 is_active = TRUE 조건이 포함되어야 한다', async () => {
const mockPosts = [
{ id: 1, post_released_at: '2025-03-01T00:00:00Z', daily_view_count: 10, daily_like_count: 5 },
];

mockPool.query.mockResolvedValue(createMockQueryResult(mockPosts));

await repo.findPostsByUserId(1);

// 쿼리 호출 확인
expect(mockPool.query).toHaveBeenCalledWith(
expect.stringContaining("p.is_active = TRUE"),
expect.anything()
);
});
});

describe('findPostsByUserIdWithGrowthMetrics', () => {
Expand All @@ -79,13 +95,7 @@ describe('PostRepository', () => {
},
];

mockPool.query.mockResolvedValue({
rows: mockPosts,
rowCount: mockPosts.length,
command: '',
oid: 0,
fields: [],
} as QueryResult);
mockPool.query.mockResolvedValue(createMockQueryResult(mockPosts));

const result = await repo.findPostsByUserIdWithGrowthMetrics(1);

Expand Down Expand Up @@ -113,13 +123,7 @@ describe('PostRepository', () => {
},
];

mockPool.query.mockResolvedValue({
rows: mockPosts,
rowCount: mockPosts.length,
command: '',
oid: 0,
fields: [],
} as QueryResult);
mockPool.query.mockResolvedValue(createMockQueryResult(mockPosts));

const result = await repo.findPostsByUserIdWithGrowthMetrics(1, undefined, false);
expect(result.posts).toEqual(mockPosts);
Expand All @@ -137,13 +141,7 @@ describe('PostRepository', () => {
},
];

mockPool.query.mockResolvedValue({
rows: mockPosts,
rowCount: mockPosts.length,
command: '',
oid: 0,
fields: [],
} as QueryResult);
mockPool.query.mockResolvedValue(createMockQueryResult(mockPosts));

const result = await repo.findPostsByUserIdWithGrowthMetrics(1, "10,2", false);
expect(result.posts).toEqual(mockPosts);
Expand All @@ -157,21 +155,43 @@ describe('PostRepository', () => {
mockPool.query.mockRejectedValue(new Error('DB connection failed'));
await expect(repo.findPostsByUserIdWithGrowthMetrics(1)).rejects.toThrow(DBError);
});

it('쿼리에 is_active = TRUE 조건이 포함되어야 한다', async () => {
const mockPosts = [
{ id: 1, view_growth: 20, like_growth: 5 },
];

mockPool.query.mockResolvedValue(createMockQueryResult(mockPosts));

await repo.findPostsByUserIdWithGrowthMetrics(1);

// 쿼리 호출 확인
expect(mockPool.query).toHaveBeenCalledWith(
expect.stringContaining("p.is_active = TRUE"),
expect.anything()
);
});
});

describe('getTotalPostCounts', () => {
it('사용자의 총 게시글 수를 반환해야 한다', async () => {
mockPool.query.mockResolvedValue({
rows: [{ count: '10' }],
rowCount: 1,
command: '',
oid: 0,
fields: [],
} as QueryResult);
mockPool.query.mockResolvedValue(createMockQueryResult([{ count: '10' }]));

const count = await repo.getTotalPostCounts(1);
expect(count).toBe(10);
});

it('is_active = TRUE인 게시물만 카운트해야 한다', async () => {
mockPool.query.mockResolvedValue(createMockQueryResult([{ count: '5' }]));

await repo.getTotalPostCounts(1);

// 쿼리 호출 확인
expect(mockPool.query).toHaveBeenCalledWith(
expect.stringContaining("is_active = TRUE"),
expect.anything()
);
});
});

describe('에러 발생 시 처리', () => {
Expand All @@ -193,17 +213,23 @@ describe('PostRepository', () => {
last_updated_date: '2025-03-08T00:00:00Z',
};

mockPool.query.mockResolvedValue({
rows: [mockStats],
rowCount: 1,
command: '',
oid: 0,
fields: [],
} as QueryResult);
mockPool.query.mockResolvedValue(createMockQueryResult([mockStats]));

const result = await repo.getYesterdayAndTodayViewLikeStats(1);
expect(result).toEqual(mockStats);
});

it('is_active = TRUE인 게시물의 통계만 반환해야 한다', async () => {
mockPool.query.mockResolvedValue(createMockQueryResult([{ daily_view_count: 20, daily_like_count: 15 }]));

await repo.getYesterdayAndTodayViewLikeStats(1);

// 쿼리 호출 확인
expect(mockPool.query).toHaveBeenCalledWith(
expect.stringContaining("p.is_active = TRUE"),
expect.anything()
);
});
});

describe('findPostByPostId', () => {
Expand All @@ -212,13 +238,7 @@ describe('PostRepository', () => {
{ date: '2025-03-08T00:00:00Z', daily_view_count: 50, daily_like_count: 30 },
];

mockPool.query.mockResolvedValue({
rows: mockStats,
rowCount: mockStats.length,
command: '',
oid: 0,
fields: [],
} as QueryResult);
mockPool.query.mockResolvedValue(createMockQueryResult(mockStats));

const result = await repo.findPostByPostId(1);
expect(result).toEqual(mockStats);
Expand All @@ -231,16 +251,10 @@ describe('PostRepository', () => {
{ date: '2025-03-08T00:00:00Z', daily_view_count: 50, daily_like_count: 30 },
];

mockPool.query.mockResolvedValue({
rows: mockStats,
rowCount: mockStats.length,
command: '',
oid: 0,
fields: [],
} as QueryResult);
mockPool.query.mockResolvedValue(createMockQueryResult(mockStats));

const result = await repo.findPostByPostUUID('uuid-1234', '2025-03-01', '2025-03-08');
expect(result).toEqual(mockStats);
});
});
});
});
6 changes: 5 additions & 1 deletion src/repositories/post.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export class PostRepository {
WHERE (date AT TIME ZONE 'Asia/Seoul' AT TIME ZONE 'UTC')::date = (NOW() AT TIME ZONE 'UTC' - INTERVAL '1 day')::date
) yesterday_stats ON p.id = yesterday_stats.post_id
WHERE p.user_id = $1
AND p.is_active = TRUE
AND (pds.post_id IS NOT NULL OR yesterday_stats.post_id IS NOT NULL)
${cursorCondition}
ORDER BY ${orderBy}
Expand Down Expand Up @@ -182,6 +183,7 @@ export class PostRepository {
WHERE (date AT TIME ZONE 'Asia/Seoul' AT TIME ZONE 'UTC')::date = (NOW() AT TIME ZONE 'UTC' - INTERVAL '1 day')::date
) yesterday_stats ON p.id = yesterday_stats.post_id
WHERE p.user_id = $1
AND p.is_active = TRUE
AND (pds.post_id IS NOT NULL OR yesterday_stats.post_id IS NOT NULL)
${cursorCondition}
ORDER BY ${orderByExpression}
Expand Down Expand Up @@ -213,7 +215,7 @@ export class PostRepository {

async getTotalPostCounts(id: number) {
try {
const query = 'SELECT COUNT(*) FROM "posts_post" WHERE user_id = $1';
const query = 'SELECT COUNT(*) FROM "posts_post" WHERE user_id = $1 AND is_active = TRUE';
const result = await this.pool.query(query, [id]);
return parseInt(result.rows[0].count, 10);
} catch (error) {
Expand Down Expand Up @@ -244,6 +246,7 @@ export class PostRepository {
WHERE (date AT TIME ZONE 'Asia/Seoul' AT TIME ZONE 'UTC')::date = (NOW() AT TIME ZONE 'UTC' - INTERVAL '1 day')::date
) yesterday_stats ON p.id = yesterday_stats.post_id
WHERE p.user_id = $1
AND p.is_active = TRUE
`;
const values = [userId];

Expand Down Expand Up @@ -304,6 +307,7 @@ export class PostRepository {
FROM posts_post p
JOIN posts_postdailystatistics pds ON p.id = pds.post_id
WHERE p.post_uuid = $1
AND p.is_active = TRUE
AND (pds.date AT TIME ZONE 'Asia/Seoul' AT TIME ZONE 'UTC')::date >= ($2 AT TIME ZONE 'Asia/Seoul' AT TIME ZONE 'UTC')::date
AND (pds.date AT TIME ZONE 'Asia/Seoul' AT TIME ZONE 'UTC')::date <= ($3 AT TIME ZONE 'Asia/Seoul' AT TIME ZONE 'UTC')::date
ORDER BY pds.date ASC
Expand Down