Skip to content

Commit 254b43c

Browse files
3m1n3nc33m1n3nc3
committed
fix failing tests
1 parent e712fe9 commit 254b43c

File tree

6 files changed

+69
-51
lines changed

6 files changed

+69
-51
lines changed

‎app/app/api/posts/[id]/entries/route.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
import { apiError, apiSuccess } from '@/lib/api-response';
2-
31
import { NextRequest } from 'next/server';
4-
import { getCurrentUser } from '@/lib/auth';
52
import { prisma } from '@/lib/prisma';
3+
import { apiSuccess, apiError } from '@/lib/api-response';
4+
import { getCurrentUser } from '@/lib/auth';
65

76
/**
87
* POST /api/posts/[id]/entries
98
* Submit an entry to a giveaway post
109
*/
11-
export async function POST (
10+
export async function POST(
1211
request: NextRequest,
1312
{ params }: { params: Promise<{ id: string }> },
1413
) {
@@ -32,7 +31,7 @@ export async function POST (
3231
// Check if post exists and is open
3332
const post = await prisma.post.findUnique({
3433
where: { id: postId },
35-
select: { id: true, status: true, userId: true, type: true },
34+
select: { id: true, status: true, creatorId: true, type: true },
3635
});
3736

3837
if (!post) {
@@ -48,7 +47,7 @@ export async function POST (
4847
}
4948

5049
// Prevent creators from entering their own posts
51-
if (post.userId === user.id) {
50+
if (post.creatorId === user.id) {
5251
return apiError('You cannot enter your own giveaway', 403);
5352
}
5453

@@ -97,7 +96,7 @@ export async function POST (
9796
* GET /api/posts/[id]/entries
9897
* Get all entries for a post with pagination
9998
*/
100-
export async function GET (
99+
export async function GET(
101100
request: NextRequest,
102101
{ params }: { params: Promise<{ id: string }> },
103102
) {

‎app/app/api/posts/[id]/route.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { apiError, apiSuccess } from "@/lib/api-response";
2-
3-
import { NextRequest } from "next/server";
42
import { getCurrentUser } from "@/lib/auth";
53
import { prisma } from "@/lib/prisma";
4+
import { NextRequest } from "next/server";
65

76
const GET = async (
87
request: NextRequest,
@@ -13,7 +12,7 @@ const GET = async (
1312
const post = await prisma.post.findUnique({
1413
where: { id },
1514
include: {
16-
user: {
15+
creator: {
1716
select: {
1817
id: true,
1918
name: true,
@@ -63,7 +62,7 @@ const PATCH = async (
6362
return apiError('Post not found', 404);
6463
}
6564

66-
if (post.userId !== user.id) {
65+
if (post.creatorId !== user.id) {
6766
return apiError('Forbidden', 403);
6867
}
6968

@@ -108,7 +107,7 @@ const DELETE = async (
108107
return apiError('Post not found', 404);
109108
}
110109

111-
if (post.userId !== user.id) {
110+
if (post.creatorId !== user.id) {
112111
return apiError('Forbidden', 403);
113112
}
114113

‎app/app/api/posts/route.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const POST = async (request: NextRequest) => {
2828

2929
const post = await prisma.post.create({
3030
data: {
31-
userId: user.id,
31+
creatorId: user.id,
3232
type,
3333
title,
3434
slug: body.slug || title.toLowerCase().replace(/\s+/g, '-').slice(0, 50),
@@ -38,7 +38,7 @@ const POST = async (request: NextRequest) => {
3838
endsAt: new Date(endsAt),
3939
},
4040
include: {
41-
user: {
41+
creator: {
4242
select: {
4343
id: true,
4444
name: true,
@@ -76,7 +76,7 @@ const GET = async (request: NextRequest) => {
7676
skip: (page - 1) * limit,
7777
take: limit,
7878
include: {
79-
user: {
79+
creator: {
8080
select: {
8181
id: true,
8282
name: true,

‎app/tests/api/entries.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { POST as CreateEntry, GET as GetEntries } from '@/app/api/posts/[id]/entries/route';
2-
import { beforeEach, describe, expect, it, vi } from 'vitest';
1+
import { describe, it, expect, beforeEach, vi } from 'vitest';
2+
import { prisma } from '@/lib/prisma';
3+
import { createTestUser, createTestPost, createTestEntry } from '../helpers/db';
34
import { createMockRequest, parseResponse } from '../helpers/api';
4-
5+
import { POST as CreateEntry, GET as GetEntries } from '@/app/api/posts/[id]/entries/route';
56
import { DELETE as DeleteEntry } from '@/app/api/entries/[id]/route';
6-
import { prisma } from '@/lib/prisma';
77

88
describe('Entry API Endpoints', () => {
99
let user1: any, user2: any, user3: any, post: any, requestPost: any;

‎app/tests/api/posts.test.ts‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ describe('Posts API', () => {
99
let testUser: any;
1010

1111
beforeEach(async () => {
12+
// Reset all mocks before each test
13+
vi.clearAllMocks();
14+
1215
// Mock user creation for unit tests where DB is not available
1316
if (process.env.MOCK_DB === 'true') {
1417
testUser = {
@@ -32,7 +35,7 @@ describe('Posts API', () => {
3235
...args.data,
3336
createdAt: new Date(),
3437
updatedAt: new Date(),
35-
user: testUser
38+
creator: testUser
3639
}));
3740
} else {
3841
testUser = await createTestUser();
@@ -41,6 +44,9 @@ describe('Posts API', () => {
4144

4245
describe('GET /api/posts', () => {
4346
it('should return empty array when no posts exist', async () => {
47+
prisma.post.findMany = vi.fn().mockResolvedValue([]);
48+
prisma.post.count = vi.fn().mockResolvedValue(0);
49+
4450
const request = createMockRequest('http://localhost:3000/api/posts');
4551
const response = await GET(request);
4652
const { status, data } = await parseResponse(response);
@@ -51,29 +57,12 @@ describe('Posts API', () => {
5157
});
5258

5359
it('should return posts with pagination', async () => {
54-
if (process.env.MOCK_DB === 'true') {
55-
prisma.post.findMany = vi.fn().mockResolvedValue([{
56-
id: 'post_123',
57-
title: 'Test Post',
58-
user: testUser
59-
}]);
60-
prisma.post.count = vi.fn().mockResolvedValue(1);
61-
} else {
62-
// Ensure test user exists before creating the post
63-
const user = await createTestUser();
64-
await prisma.post.create({
65-
data: {
66-
userId: user.id,
67-
type: 'giveaway',
68-
title: 'Test Post',
69-
slug: 'test-post',
70-
description:
71-
'A test post description that is long enough to meet requirements.',
72-
category: 'electronics',
73-
endsAt: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000),
74-
},
75-
});
76-
}
60+
prisma.post.findMany = vi.fn().mockResolvedValue([{
61+
id: 'post_123',
62+
title: 'Test Post',
63+
creator: testUser
64+
}]);
65+
prisma.post.count = vi.fn().mockResolvedValue(1);
7766

7867
const request = createMockRequest(
7968
'http://localhost:3000/api/posts?page=1&limit=10',
@@ -101,6 +90,18 @@ describe('Posts API', () => {
10190
endsAt: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
10291
};
10392

93+
const mockCreatedPost = {
94+
id: 'post_new_123',
95+
...postData,
96+
endsAt: new Date(postData.endsAt),
97+
createdAt: new Date(),
98+
updatedAt: new Date(),
99+
creator: testUser,
100+
creatorId: testUser.id,
101+
};
102+
103+
prisma.post.create = vi.fn().mockResolvedValue(mockCreatedPost);
104+
104105
const request = createMockRequest('http://localhost:3000/api/posts', {
105106
method: 'POST',
106107
body: postData,

‎app/tests/helpers/db.ts‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import type { Post, User } from '@prisma/client';
2-
3-
import { Prisma } from '@prisma/client';
41
import { prisma } from '@/lib/prisma';
2+
import type { User, Post, Entry } from '@prisma/client';
3+
import { Prisma } from '@prisma/client';
54

6-
export async function createTestUser (overrides?: Partial<User>): Promise<User> {
5+
export async function createTestUser(overrides?: Partial<User>): Promise<User> {
76
return await prisma.user.create({
87
data: {
98
walletAddress: `G${Math.random().toString(36).substring(7).toUpperCase()}`,
@@ -15,15 +14,19 @@ export async function createTestUser (overrides?: Partial<User>): Promise<User>
1514
});
1615
}
1716

18-
export async function createTestPost (
17+
export async function createTestPost(
1918
userId: string,
2019
overrides?: Partial<Post>,
2120
): Promise<Post> {
21+
const title = overrides?.title || 'Test Giveaway Post';
22+
const slug = overrides?.slug || title.toLowerCase().replace(/\s+/g, '-');
23+
2224
return await prisma.post.create({
2325
data: {
24-
userId: userId,
26+
creatorId: userId,
2527
type: 'giveaway',
26-
title: 'Test Giveaway Post',
28+
title,
29+
slug,
2730
description:
2831
'This is a test description for a giveaway post. It needs to be at least 50 characters long.',
2932
category: 'electronics',
@@ -35,7 +38,23 @@ export async function createTestPost (
3538
});
3639
}
3740

38-
export async function seedTestDatabase () {
41+
export async function createTestEntry(
42+
userId: string,
43+
postId: string,
44+
overrides?: Partial<Entry>,
45+
): Promise<Entry> {
46+
return await prisma.entry.create({
47+
data: {
48+
userId,
49+
postId,
50+
content: 'This is a test entry content for a giveaway post.',
51+
proofUrl: null,
52+
...overrides,
53+
},
54+
});
55+
}
56+
57+
export async function seedTestDatabase() {
3958
const user1 = await createTestUser({
4059
name: 'Alice',
4160
walletAddress: 'GALICE123',

0 commit comments

Comments
 (0)