diff --git a/src/main/java/com/sopt/push/dto/ApiGatewayRequestDto.java b/src/main/java/com/sopt/push/dto/ApiGatewayRequestDto.java index 612ff0a..e781eee 100644 --- a/src/main/java/com/sopt/push/dto/ApiGatewayRequestDto.java +++ b/src/main/java/com/sopt/push/dto/ApiGatewayRequestDto.java @@ -2,4 +2,4 @@ import java.util.Map; -public record ApiGatewayRequestDto(RegisterHeaderDto header, Map body) {} +public record ApiGatewayRequestDto(RequestHeaderDto header, Map body) {} diff --git a/src/main/java/com/sopt/push/dto/RegisterHeaderDto.java b/src/main/java/com/sopt/push/dto/RequestHeaderDto.java similarity index 87% rename from src/main/java/com/sopt/push/dto/RegisterHeaderDto.java rename to src/main/java/com/sopt/push/dto/RequestHeaderDto.java index 29e7118..8408ad8 100644 --- a/src/main/java/com/sopt/push/dto/RegisterHeaderDto.java +++ b/src/main/java/com/sopt/push/dto/RequestHeaderDto.java @@ -4,5 +4,5 @@ import com.sopt.push.enums.Platform; import com.sopt.push.enums.Services; -public record RegisterHeaderDto( +public record RequestHeaderDto( String transactionId, Services service, Platform platform, Actions action) {} diff --git a/src/main/java/com/sopt/push/lambda/ApiGatewayHandler.java b/src/main/java/com/sopt/push/lambda/ApiGatewayHandler.java index 5987588..8f6ba20 100644 --- a/src/main/java/com/sopt/push/lambda/ApiGatewayHandler.java +++ b/src/main/java/com/sopt/push/lambda/ApiGatewayHandler.java @@ -23,8 +23,8 @@ import com.sopt.push.domain.DeviceTokenEntity; import com.sopt.push.dto.ApiGatewayRequestDto; import com.sopt.push.dto.CreateHistoryDto; -import com.sopt.push.dto.RegisterHeaderDto; import com.sopt.push.dto.RequestDeleteTokenDto; +import com.sopt.push.dto.RequestHeaderDto; import com.sopt.push.dto.RequestRegisterUserDto; import com.sopt.push.dto.RequestSendAllPushMessageDto; import com.sopt.push.dto.RequestSendPushMessageDto; @@ -114,9 +114,14 @@ private ApiGatewayRequestDto extractRequest(APIGatewayProxyRequestEvent event) { String transactionId = headers.get(HEADER_TRANSACTION_ID); String serviceStr = headers.get(HEADER_SERVICE); Actions action = Actions.fromValue(actionStr); - Platform platform = Platform.fromValue(platformStr); - RegisterHeaderDto header = - new RegisterHeaderDto(transactionId, Services.fromValue(serviceStr), platform, action); + Platform platform = null; + + if (action == Actions.REGISTER || action == Actions.CANCEL) { + platform = Platform.fromValue(platformStr); + } + + RequestHeaderDto header = + new RequestHeaderDto(transactionId, Services.fromValue(serviceStr), platform, action); return new ApiGatewayRequestDto(header, body); } catch (Exception e) {