-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Feat/backend/room user relation #41
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
15 changes: 15 additions & 0 deletions
15
backend/prisma/migrations/20231111115551_add_oweer_id/migration.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
/* | ||
Warnings: | ||
|
||
- A unique constraint covering the columns `[ownerId]` on the table `Room` will be added. If there are existing duplicate values, this will fail. | ||
- Added the required column `ownerId` to the `Room` table without a default value. This is not possible if the table is not empty. | ||
|
||
*/ | ||
-- AlterTable | ||
ALTER TABLE "Room" ADD COLUMN "ownerId" INTEGER NOT NULL; | ||
|
||
-- CreateIndex | ||
CREATE UNIQUE INDEX "Room_ownerId_key" ON "Room"("ownerId"); | ||
|
||
-- AddForeignKey | ||
ALTER TABLE "Room" ADD CONSTRAINT "Room_ownerId_fkey" FOREIGN KEY ("ownerId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kotto5 marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
// import { CreateRoomDto } from './create-room.dto'; | ||
import { ApiProperty } from '@nestjs/swagger'; | ||
import { Room } from '@prisma/client'; | ||
import { CreateRoomDto } from './create-room.dto'; | ||
import { IsEmail, IsNotEmpty, IsString, MinLength } from 'class-validator'; | ||
Check failure on line 5 in backend/src/room/dto/create-room-request.dto.ts GitHub Actions / Lint Backend
Check failure on line 5 in backend/src/room/dto/create-room-request.dto.ts GitHub Actions / Lint Backend
|
||
kotto5 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
// export type CreateRoomRequestDto = Omit<CreateRoomDto, 'ownerId'>; | ||
kotto5 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
export class CreateRoomRequestDto { | ||
@IsString() | ||
@ApiProperty() | ||
name: string; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,13 @@ | ||
import { ApiProperty } from '@nestjs/swagger'; | ||
import { IsString, IsNotEmpty } from 'class-validator'; | ||
import { IsString, IsNotEmpty, IsNumber } from 'class-validator'; | ||
|
||
export class CreateRoomDto { | ||
@ApiProperty() | ||
id: number; | ||
|
||
@IsString() | ||
@IsNotEmpty() | ||
@ApiProperty() | ||
name: string; | ||
|
||
@IsNumber() | ||
@ApiProperty() | ||
ownerId: number; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
口頭でも言いましたが、一つの機能(PR)の中でmigrationファイルが3つに分かれているのはわかりづらいので、(経過としてはいいですが)、一回migrationファイルを消してから
prisma migrate dev
しなおすとかしてからgit rebaseし直すなどして欲しかったですね!やり方はわかりますかね?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
分からない! todo