Skip to content

Commit

Permalink
Merge pull request #261 from WE-ARE-RACCOONS/RAC-367
Browse files Browse the repository at this point in the history
RAC-367 feat : 매칭 관련 알림톡 구현
  • Loading branch information
ywj9811 authored May 14, 2024
2 parents ef101aa + c5ce3c5 commit 49d673a
Show file tree
Hide file tree
Showing 40 changed files with 232 additions and 69 deletions.
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ repositories {

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-amqp'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-data-redis'
implementation 'org.springframework.boot:spring-boot-starter-security'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.postgraduate.domain.payment.application.usecase.PaymentManageUseCase;
import com.postgraduate.domain.user.domain.entity.User;
import com.postgraduate.domain.user.domain.service.UserGetService;
import com.postgraduate.global.bizppurio.usecase.BizppurioJuniorMessage;
import com.postgraduate.global.bizppurio.application.usecase.BizppurioJuniorMessage;
import com.postgraduate.global.slack.SlackErrorMessage;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.postgraduate.domain.senior.exception.SeniorCertificationException;
import com.postgraduate.domain.wish.domain.entity.Wish;
import com.postgraduate.domain.wish.domain.service.WishGetService;
import com.postgraduate.global.bizppurio.usecase.BizppurioSeniorMessage;
import com.postgraduate.global.bizppurio.application.usecase.BizppurioSeniorMessage;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import com.postgraduate.domain.wish.application.mapper.WishMapper;
import com.postgraduate.domain.wish.domain.entity.Wish;
import com.postgraduate.domain.wish.domain.service.WishSaveService;
import com.postgraduate.global.bizppurio.usecase.BizppurioSeniorMessage;
import com.postgraduate.global.bizppurio.application.usecase.BizppurioSeniorMessage;
import com.postgraduate.global.slack.SlackSignUpMessage;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import com.postgraduate.domain.payment.domain.service.PaymentGetService;
import com.postgraduate.domain.senior.domain.entity.Senior;
import com.postgraduate.domain.user.domain.entity.User;
import com.postgraduate.global.bizppurio.usecase.BizppurioJuniorMessage;
import com.postgraduate.global.bizppurio.usecase.BizppurioSeniorMessage;
import com.postgraduate.global.bizppurio.application.usecase.BizppurioJuniorMessage;
import com.postgraduate.global.bizppurio.application.usecase.BizppurioSeniorMessage;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import com.postgraduate.domain.senior.domain.entity.Senior;
import com.postgraduate.domain.senior.domain.service.SeniorGetService;
import com.postgraduate.domain.user.domain.entity.User;
import com.postgraduate.global.bizppurio.usecase.BizppurioJuniorMessage;
import com.postgraduate.global.bizppurio.usecase.BizppurioSeniorMessage;
import com.postgraduate.global.bizppurio.application.usecase.BizppurioJuniorMessage;
import com.postgraduate.global.bizppurio.application.usecase.BizppurioSeniorMessage;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.postgraduate.global.bizppurio.dto.req;
package com.postgraduate.global.bizppurio.application.dto.req;

public record CommonRequest(
String account,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.postgraduate.global.bizppurio.application.dto.req;

import com.postgraduate.global.bizppurio.application.dto.req.content.Message;

public record ContentRequest(Message at) {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.postgraduate.global.bizppurio.application.dto.req;

public record JuniorMatchingFailRequest(
String phoneNumber, String name, String originPostgraduate, String originMajor, String alterPostgraduate, String alterMajor
) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.postgraduate.global.bizppurio.application.dto.req;

public record JuniorMatchingSuccessRequest(
String phoneNumber, String name, String postgraduate, String major
) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.postgraduate.global.bizppurio.application.dto.req;

public record JuniorMatchingWaitingRequest(
String name,
String phoneNumber
) {
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.postgraduate.global.bizppurio.dto.req.content;
package com.postgraduate.global.bizppurio.application.dto.req.content;

import com.postgraduate.global.bizppurio.dto.req.content.button.WebLinkButton;
import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton;

public record CertificationApproveMessage(
String message,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.postgraduate.global.bizppurio.dto.req.content;
package com.postgraduate.global.bizppurio.application.dto.req.content;

import com.postgraduate.global.bizppurio.dto.req.content.button.WebLinkButton;
import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton;

public record CertificationDeniedMessage(
String message,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.postgraduate.global.bizppurio.dto.req.content;
package com.postgraduate.global.bizppurio.application.dto.req.content;

public record JuniorAcceptMessage(
String message,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.postgraduate.global.bizppurio.dto.req.content;
package com.postgraduate.global.bizppurio.application.dto.req.content;

public record JuniorApplyMessage(
String message,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.postgraduate.global.bizppurio.dto.req.content;
package com.postgraduate.global.bizppurio.application.dto.req.content;

import com.postgraduate.global.bizppurio.dto.req.content.button.WebLinkButton;
import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton;

public record JuniorFinishMessage(
String message,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.postgraduate.global.bizppurio.application.dto.req.content;

import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton;

public record JuniorMatchingFailMessage (
String message,
String senderkey,
String templatecode,
WebLinkButton[] button
) implements Message
{}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.postgraduate.global.bizppurio.application.dto.req.content;

import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton;

public record JuniorMatchingSuccessMessage(
String message,
String senderkey,
String templatecode,
WebLinkButton[] button
) implements Message {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.postgraduate.global.bizppurio.application.dto.req.content;

public record JuniorMatchingWaitingMessage(
String message,
String senderkey,
String templatecode
) implements Message {
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.postgraduate.global.bizppurio.dto.req.content;
package com.postgraduate.global.bizppurio.application.dto.req.content;

import com.postgraduate.global.bizppurio.dto.req.content.button.WebLinkButton;
import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton;

public record JuniorRefuseMessage(
String message,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.postgraduate.global.bizppurio.application.dto.req.content;

public interface Message {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.postgraduate.global.bizppurio.dto.req.content;
package com.postgraduate.global.bizppurio.application.dto.req.content;

public record SeniorAcceptMessage(
String message,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.postgraduate.global.bizppurio.dto.req.content;
package com.postgraduate.global.bizppurio.application.dto.req.content;

import com.postgraduate.global.bizppurio.dto.req.content.button.WebLinkButton;
import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton;

public record SeniorApplyMessage(
String message,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.postgraduate.global.bizppurio.dto.req.content;
package com.postgraduate.global.bizppurio.application.dto.req.content;

public record SeniorFinishMessage(
String message,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.postgraduate.global.bizppurio.dto.req.content;
package com.postgraduate.global.bizppurio.application.dto.req.content;

import com.postgraduate.global.bizppurio.dto.req.content.button.WebLinkButton;
import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton;

public record SeniorSingUpMessage(
String message,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.postgraduate.global.bizppurio.dto.req.content.button;
package com.postgraduate.global.bizppurio.application.dto.req.content.button;

public record WebLinkButton(
String name,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package com.postgraduate.global.bizppurio.dto.res;
package com.postgraduate.global.bizppurio.application.dto.res;

public record BizppurioTokenResponse(String accesstoken, String type, String expired) {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.postgraduate.global.bizppurio.dto.res;
package com.postgraduate.global.bizppurio.application.dto.res;

public record MessageResponse(int code, String description, String messagekey, String refkey) {
}
Loading

0 comments on commit 49d673a

Please sign in to comment.