Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
79 changes: 79 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"@nestjs/swagger": "^11.2.0",
"@nestjs/typeorm": "^11.0.0",
"@nestjs/websockets": "^11.1.6",
"ioredis": "^5.10.0",
"jsonwebtoken": "^9.0.2",
"mysql2": "^3.14.4",
"reflect-metadata": "^0.2.2",
Expand Down
6 changes: 4 additions & 2 deletions src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import { CardsetOrmEntity } from './cardset/infrastructure/persistence/orm/cards
import { CardOrmEntity } from './cardset/infrastructure/persistence/orm/card.orm-entity';
import { CardsetManagerOrmEntity } from './cardset/infrastructure/persistence/orm/cardset-manager.orm-entity';
import { CardSetMetadataOrmEntity } from './cardset/infrastructure/persistence/orm/cardset-metadata.orm-entity';
import { YjsDocumentOrmEntity } from './collaboration/infrastructure/persistence/orm/yjs-document.orm-entity';
import { CardsetContentOrmEntity } from './collaboration/infrastructure/persistence/orm/cardset-content.orm-entity';
import { CardsetIncrementalOrmEntity } from './collaboration/infrastructure/persistence/orm/cardset-incremental.orm-entity';

@Module({
imports: [
Expand All @@ -27,7 +28,8 @@ import { YjsDocumentOrmEntity } from './collaboration/infrastructure/persistence
CardOrmEntity,
CardsetManagerOrmEntity,
CardSetMetadataOrmEntity,
YjsDocumentOrmEntity,
CardsetContentOrmEntity,
CardsetIncrementalOrmEntity,
],
synchronize: true,
}),
Expand Down
14 changes: 13 additions & 1 deletion src/auth/infrastructure/guard/ws-auth.guard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,23 @@ import { Socket } from 'socket.io';
export class WsAuthGuard implements CanActivate {
private readonly logger = new Logger(WsAuthGuard.name);

constructor(private readonly authService: AuthService) {}
constructor(private readonly authService: AuthService) { }

canActivate(context: ExecutionContext): boolean {
const client: Socket = context.switchToWs().getClient<Socket>();

const SKIP_AUTH = process.env.SKIP_WS_AUTH === 'true';
if (SKIP_AUTH) {
(client.data as { user: unknown }).user = {
userId: 'test-user',
email: 'test@example.com',
};
this.logger.warn(
`⚠️ 테스트 모드: 인증을 건너뛰고 있습니다 (client ${client.id})`,
);
return true;
}

const bearer =
(client.handshake.auth?.token as string | undefined) ??
client.handshake.headers?.authorization;
Expand Down
23 changes: 17 additions & 6 deletions src/cardset/application/cardset.use-case.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { UserGrpcClient } from '../infrastructure/grpc/user-grpc.client';
import type { UserInfo } from '../infrastructure/grpc/user-grpc.client';
import { CreateCardsetRequest } from './dto/request/create-cardset.request';
import { UpdateCardsetRequest } from './dto/request/update-cardset.request';
import { CollaborationUseCase } from '../../collaboration/application/collaboration.use-case';

@Injectable()
export class CardsetUseCase {
Expand All @@ -39,6 +40,7 @@ export class CardsetUseCase {
private readonly dataSource: DataSource,
@Inject(CARDSET_METADATA_REPOSITORY)
private readonly metadataRepository: ICardSetMetadataRepository,
private readonly collaborationUseCase: CollaborationUseCase,
) {}

private async checkIsManager(
Expand All @@ -58,7 +60,6 @@ export class CardsetUseCase {
async create(userId: number, dto: CreateCardsetRequest): Promise<Cardset> {
await this.groupGrpcClient.checkUserInGroup(dto.groupId, userId);

// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const additionalManagerIds: number[] = dto.managerIds ?? [];
for (const managerId of additionalManagerIds) {
await this.groupGrpcClient.checkUserInGroup(dto.groupId, managerId);
Expand Down Expand Up @@ -110,11 +111,11 @@ export class CardsetUseCase {
cardSetIds: number[],
): Promise<Map<number, UserInfo[]>> {
if (cardSetIds.length === 0 || this.skipUserGrpc) return new Map();
/* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call */

const managers: CardsetManager[] =
await this.cardsetManagerRepository.findByCardSetIds(cardSetIds);
const userIds: number[] = [...new Set(managers.map((m) => m.userId))];
/* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call */

const users = await this.userGrpcClient.getUsersByIds(userIds);
const userMap = new Map(users.map((u) => [Number(u.id), u]));
const result = new Map<number, UserInfo[]>();
Expand Down Expand Up @@ -249,11 +250,11 @@ export class CardsetUseCase {
}[]
> {
await this.groupGrpcClient.checkUserInGroup(groupId, userId);
/* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call */

const cardsets: Cardset[] =
await this.cardsetRepository.findByGroupId(groupId);
const ids: number[] = cardsets.map((c) => c.id);
/* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call */

const [metadataMap, likedMap, bookmarkedMap, managersMap] =
await Promise.all([
this.metadataRepository.findByCardSetIds(ids),
Expand Down Expand Up @@ -308,7 +309,6 @@ export class CardsetUseCase {

return this.dataSource.transaction(async (manager) => {
if (dto.managerIds !== undefined) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const newManagerIds: number[] = dto.managerIds;
for (const managerId of newManagerIds) {
await this.groupGrpcClient.checkUserInGroup(
Expand Down Expand Up @@ -404,4 +404,15 @@ export class CardsetUseCase {
return this.cardsetRepository.update(id, updatedCardset);
});
}

async saveCards(cardSetId: number, userId: number): Promise<void> {
await this.checkIsManager(cardSetId, userId);
await this.collaborationUseCase.saveCardsetContent(cardSetId);
}

async findCardsFromYjs(
cardSetId: number,
): Promise<{ id: string; question: string; answer: string }[]> {
return this.collaborationUseCase.getCards(cardSetId);
}
}
15 changes: 15 additions & 0 deletions src/cardset/application/dto/response/card.response.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,19 @@ export class CardResponse {
res.updatedAt = card.updatedAt;
return res;
}

static fromYjs(card: {
id: string;
question: string;
answer: string;
}): CardResponse {
const res = new CardResponse();
res.id = Number(card.id);
res.content = card.question;
res.order = 0;
res.cardsetId = 0;
res.createdAt = new Date();
res.updatedAt = new Date();
return res;
}
}
24 changes: 24 additions & 0 deletions src/cardset/application/dto/response/yjs-card.response.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { ApiProperty } from '@nestjs/swagger';

export class YjsCardResponse {
@ApiProperty({ example: '1' })
id!: string;

@ApiProperty({ example: '질문 내용' })
question!: string;

@ApiProperty({ example: '답변 내용' })
answer!: string;

static from(card: {
id: string;
question: string;
answer: string;
}): YjsCardResponse {
const res = new YjsCardResponse();
res.id = card.id;
res.question = card.question;
res.answer = card.answer;
return res;
}
}
9 changes: 8 additions & 1 deletion src/cardset/cardset.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { ImageGrpcClient } from './infrastructure/grpc/image-grpc.client';
import { ReactionGrpcClient } from './infrastructure/grpc/reaction-grpc.client';
import { UserGrpcClient } from './infrastructure/grpc/user-grpc.client';
import { GrpcClientModule } from '../shared/grpc/grpc-client.module';
import { CollaborationModule } from '../collaboration/collaboration.module';

@Module({
imports: [
Expand All @@ -40,8 +41,14 @@ import { GrpcClientModule } from '../shared/grpc/grpc-client.module';
CardSetMetadataOrmEntity,
]),
GrpcClientModule,
CollaborationModule,
],
controllers: [
CardsetController,
CardController,
GroupCardsetController,
CardsetGrpcController,
],
controllers: [CardsetController, CardController, GroupCardsetController, CardsetGrpcController],
providers: [
{ provide: CARDSET_REPOSITORY, useClass: CardsetRepositoryImpl },
{ provide: CARD_REPOSITORY, useClass: CardRepositoryImpl },
Expand Down
6 changes: 5 additions & 1 deletion src/cardset/domain/repository/card.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ export interface ICardRepository {
findById(id: number): Promise<Card | null>;
findAllByCardsetId(cardsetId: number): Promise<Card[]>;
save(card: Card, manager?: EntityManager): Promise<Card>;
update(id: number, card: Partial<Card>): Promise<Card | null>;
update(
id: number,
card: Partial<Card>,
manager?: EntityManager,
): Promise<Card | null>;
delete(id: number, manager?: EntityManager): Promise<void>;
updateOrder(
cardId: number,
Expand Down
12 changes: 9 additions & 3 deletions src/cardset/domain/repository/cardset-metadata.repository.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
export const CARDSET_METADATA_REPOSITORY = Symbol('CARDSET_METADATA_REPOSITORY');
export const CARDSET_METADATA_REPOSITORY = Symbol(
'CARDSET_METADATA_REPOSITORY',
);

export interface ICardSetMetadataRepository {
findByCardSetId(cardSetId: number): Promise<{ likeCount: number; bookmarkCount: number } | null>;
findByCardSetIds(cardSetIds: number[]): Promise<Map<number, { likeCount: number; bookmarkCount: number }>>;
findByCardSetId(
cardSetId: number,
): Promise<{ likeCount: number; bookmarkCount: number } | null>;
findByCardSetIds(
cardSetIds: number[],
): Promise<Map<number, { likeCount: number; bookmarkCount: number }>>;
upsertAndIncrementLike(cardSetId: number): Promise<void>;
upsertAndDecrementLike(cardSetId: number): Promise<void>;
upsertAndIncrementBookmark(cardSetId: number): Promise<void>;
Expand Down
8 changes: 6 additions & 2 deletions src/cardset/infrastructure/grpc/reaction-grpc.client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ export class ReactionGrpcClient implements OnModuleInit {
userId,
}),
);
return new Map(Object.entries(result.results).map(([k, v]) => [Number(k), v]));
return new Map(
Object.entries(result.results).map(([k, v]) => [Number(k), v]),
);
}

async areBookmarked(
Expand All @@ -85,6 +87,8 @@ export class ReactionGrpcClient implements OnModuleInit {
userId,
}),
);
return new Map(Object.entries(result.results).map(([k, v]) => [Number(k), v]));
return new Map(
Object.entries(result.results).map(([k, v]) => [Number(k), v]),
);
}
}
Loading
Loading