Skip to content

Commit

Permalink
question 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
overthestream committed Nov 20, 2023
1 parent 7e985b1 commit 12a9d5e
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 7 deletions.
8 changes: 6 additions & 2 deletions src/blurting/blurting.consumer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ export class BlurtingConsumer {
) {}
@Process()
async processNewBlurtingQuestion(job: Job) {
const question: BlurtingQuestionEntity = job.data.question;
const question: string = job.data.question;
const group: BlurtingGroupEntity = job.data.group;
const users: number[] = job.data.users;
await this.blurtingService.insertQuestionToGroup(question, group);
await this.blurtingService.insertQuestionToGroup(
question,
group,
job.data.no,
);
await Promise.all(
users.map(async (userid) => {
await this.fcmService.sendPush(
Expand Down
36 changes: 32 additions & 4 deletions src/blurting/blurting.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,30 @@ export class BlurtingService {
}),
);

const questions = await this.questionRepository.find();
const questions = [
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
'ㅁㅁ',
];
const shuffled = questions.sort(() => 0.5 - Math.random());

const selected = shuffled.slice(0, 9);
Expand All @@ -69,11 +92,16 @@ export class BlurtingService {
}

async insertQuestionToGroup(
question: BlurtingQuestionEntity,
question: string,
group: BlurtingGroupEntity,
no: number,
) {
await group.questions.push(question);
await this.groupRepository.save(group);
const newQuestion = this.questionRepository.create({
group,
question,
no,
});
await this.questionRepository.save(newQuestion);
}

async getBlurting(group: BlurtingGroupEntity): Promise<BlurtingPageDto> {
Expand Down
2 changes: 1 addition & 1 deletion src/entities/blurtingQuestion.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export class BlurtingQuestionEntity {
@PrimaryGeneratedColumn()
id: number;

@ManyToOne(() => BlurtingGroupEntity)
@ManyToOne(() => BlurtingGroupEntity, (group) => group.questions)
group: BlurtingGroupEntity;

@Column()
Expand Down

0 comments on commit 12a9d5e

Please sign in to comment.