Skip to content
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

이벤트 참가 관련 admin 가드 적용 변경 #84

Merged
merged 5 commits into from
May 15, 2024
Merged

이벤트 참가 관련 admin 가드 적용 변경 #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5a23d0
Merge pull request #82 from Codeit-part4-team3/dev
SiWooJinSeok May 13, 2024
696f1b6
Merge pull request #83 from Codeit-part4-team3/dev
Jnnsu May 13, 2024
8d34717
Feat: 결제 내역 조회 admin 가드 삭제
Jnnsu May 14, 2024
f6e1fa6
Merge branch 'dev' into pq-65
Jnnsu May 14, 2024
1df4103
Merge branch 'main' into pq-65
Jnnsu May 14, 2024
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
7 changes: 0 additions & 7 deletions prisma/migrations/20240512070833_/migration.sql
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions prisma/migrations/20240512105229_/migration.sql
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions prisma/migrations/20240512131417_/migration.sql
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions prisma/migrations/20240513074535_/migration.sql
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions prisma/migrations/20240514094010_/migration.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
-- AlterTable
ALTER TABLE `Plan` MODIFY `type` ENUM('BASIC', 'PREMIUM', 'EVENT') NOT NULL;

-- AlterTable
ALTER TABLE `User` ADD COLUMN `imageUrl` VARCHAR(191) NULL;

-- CreateTable
CREATE TABLE `EventAmount` (
`id` INTEGER NOT NULL AUTO_INCREMENT,
`amount` INTEGER NOT NULL,
`createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),

PRIMARY KEY (`id`)
) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
2 changes: 0 additions & 2 deletions src/payments/payments.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { ApiBearerAuth, ApiBody, ApiTags } from '@nestjs/swagger';
import { JwtAuthGuard } from './../auth/jwt-auth-guard';
import { UpdateSubscriptionDto } from '../dto/updateSubscription.dto';
import { CancelPaymentDto } from '../dto/cancelPayment.dto';
import { AdminGuard } from '../auth/admin-guard';

@UseGuards(JwtAuthGuard)
@ApiBearerAuth('accessToken')
Expand Down Expand Up @@ -54,7 +53,6 @@ export class PaymentsController {
}

@Get('plan/:planId')
@UseGuards(AdminGuard)
getPaymentsByPlanId(@Param('planId') planId: string) {
return this.paymentsService.getPaymentsByPlanId(planId);
}
Expand Down
Loading