diff --git a/src/main/java/com/workat/api/chat/controller/ChatController.java b/src/main/java/com/workat/api/chat/controller/ChatController.java index 4f5fbcb1..dc730fb7 100644 --- a/src/main/java/com/workat/api/chat/controller/ChatController.java +++ b/src/main/java/com/workat/api/chat/controller/ChatController.java @@ -37,7 +37,7 @@ public class ChatController { @ApiOperation("채팅방을 생성하는 api") @ApiImplicitParams(value = { - @ApiImplicitParam(name = "otherUserId", value = "1", required = true, dataType = "long", example = "1"), + @ApiImplicitParam(name = "ownerUserId", value = "1", required = true, dataType = "long", example = "1"), }) @ApiResponses(value = { @ApiResponse(code = 200, message = "success", response = Long.class) diff --git a/src/main/java/com/workat/api/map/dto/WorkerDto.java b/src/main/java/com/workat/api/map/dto/WorkerDto.java index 805bf6d6..95d92f8f 100644 --- a/src/main/java/com/workat/api/map/dto/WorkerDto.java +++ b/src/main/java/com/workat/api/map/dto/WorkerDto.java @@ -27,7 +27,7 @@ public class WorkerDto { @ApiModelProperty(name = "imageUrl", notes = "워케이셔너 사진 이미지 주소", example = "https://avatars.githubusercontent.com/u/46469385?v=4") private String imageUrl; - @ApiModelProperty(name = "position", notes = "워케이셔너 직무", example = "{\"name\":\"IT_ENGINEER\",\"content\":\"IT 엔지니어 및 보안\"}") + @ApiModelProperty(name = "position", notes = "워케이셔너 직무", example = "{\"name\":\"ENGINEER\",\"content\":\"IT 엔지니어 및 보안\"}") private DepartmentTypeDto position; @ApiModelProperty(name = "workingYear", notes = "워케이셔너 연차", example = "{\"name\":\"JUNIOR\",\"content\":\"주니어(1~4년)\"}") @@ -45,7 +45,8 @@ public class WorkerDto { @ApiModelProperty(name = "activities", notes = "희망 활동") private List activities; - private WorkerDto(long id, String nickname, String imageUrl, DepartmentType position, DurationType workingYear, String company, String story, int workchats, List activities) { + private WorkerDto(long id, String nickname, String imageUrl, DepartmentType position, DurationType workingYear, + String company, String story, int workchats, List activities) { this.id = id; this.nickname = nickname; this.imageUrl = imageUrl; @@ -58,7 +59,9 @@ private WorkerDto(long id, String nickname, String imageUrl, DepartmentType posi } public static WorkerDto of(UserProfile userProfile, int workchats, List activities) { - return new WorkerDto(userProfile.getId(), userProfile.getNickname(), userProfile.getImageUrl(), userProfile.getPosition(), userProfile.getWorkingYear(), userProfile.getCompany(), userProfile.getStory(), workchats, activities); + return new WorkerDto(userProfile.getId(), userProfile.getNickname(), userProfile.getImageUrl(), + userProfile.getPosition(), userProfile.getWorkingYear(), userProfile.getCompany(), userProfile.getStory(), + workchats, activities); } } diff --git a/src/main/java/com/workat/api/user/dto/request/SignUpRequest.java b/src/main/java/com/workat/api/user/dto/request/SignUpRequest.java index 2d110853..aeac2ed2 100644 --- a/src/main/java/com/workat/api/user/dto/request/SignUpRequest.java +++ b/src/main/java/com/workat/api/user/dto/request/SignUpRequest.java @@ -26,7 +26,7 @@ public class SignUpRequest { @ApiModelProperty(name = "nickname", notes = "유저 닉네임", example = "\"나는스벅라떼좋아\"") private String nickname; - @ApiModelProperty(name = "position", notes = "직무 타입", example = "\"IT_ENGINEER\"") + @ApiModelProperty(name = "position", notes = "직무 타입") private DepartmentType position; @ApiModelProperty(name = "workingYear", notes = "연차 타입", example = "\"JUNIOR\"") diff --git a/src/main/java/com/workat/api/user/dto/request/UserUpdateRequest.java b/src/main/java/com/workat/api/user/dto/request/UserUpdateRequest.java index 9c71c062..20bb9747 100644 --- a/src/main/java/com/workat/api/user/dto/request/UserUpdateRequest.java +++ b/src/main/java/com/workat/api/user/dto/request/UserUpdateRequest.java @@ -9,6 +9,7 @@ import com.workat.common.annotation.IsValidListSize; import com.workat.domain.user.job.DepartmentType; import com.workat.domain.user.job.DurationType; + import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.NoArgsConstructor; @@ -21,7 +22,7 @@ public class UserUpdateRequest { @ApiModelProperty(name = "nickname", notes = "유저 닉네임", example = "\"나는스벅라떼좋아\"") private String nickname; - @ApiModelProperty(name = "position", notes = "직무 타입", example = "\"IT_ENGINEER\"") + @ApiModelProperty(name = "position", notes = "직무 타입") private DepartmentType position; @ApiModelProperty(name = "workingYear", notes = "연차 타입", example = "\"JUNIOR\"") @@ -34,7 +35,8 @@ public class UserUpdateRequest { @IsValidListSize(max = 3, message = "1개 이상 3개 이하의 리스트가 인풋으로 들어와야합니다") private List activities; - private UserUpdateRequest(String nickname, DepartmentType position, DurationType workingYear, String story, List activities) { + private UserUpdateRequest(String nickname, DepartmentType position, DurationType workingYear, String story, + List activities) { this.nickname = nickname; this.position = position; this.workingYear = workingYear; diff --git a/src/main/java/com/workat/api/user/dto/response/MyProfileResponse.java b/src/main/java/com/workat/api/user/dto/response/MyProfileResponse.java index d21009a4..eaf8a4b0 100644 --- a/src/main/java/com/workat/api/user/dto/response/MyProfileResponse.java +++ b/src/main/java/com/workat/api/user/dto/response/MyProfileResponse.java @@ -8,6 +8,7 @@ import com.workat.domain.user.entity.UserProfile; import com.workat.domain.user.job.DepartmentType; import com.workat.domain.user.job.DurationType; + import io.swagger.annotations.ApiModelProperty; import lombok.AccessLevel; import lombok.Getter; @@ -26,7 +27,7 @@ public class MyProfileResponse { @ApiModelProperty(name = "imageUrl", notes = "워케이셔너 사진 이미지 주소", example = "https://avatars.githubusercontent.com/u/46469385?v=4") private String imageUrl; - @ApiModelProperty(name = "position", notes = "워케이셔너 직무", example = "{\"name\":\"IT_ENGINEER\",\"content\":\"IT 엔지니어 및 보안\"}") + @ApiModelProperty(name = "position", notes = "워케이셔너 직무", example = "{\"name\":\"ENGINEER\",\"content\":\"IT 엔지니어 및 보안\"}") private DepartmentTypeDto position; @ApiModelProperty(name = "workingYear", notes = "워케이셔너 연차", example = "{\"name\":\"JUNIOR\",\"content\":\"주니어(1~4년)\"}") @@ -49,7 +50,9 @@ public class MyProfileResponse { // TODO: 내 소식 - 새 댓글 알람 수 추가 필요 - private MyProfileResponse(long id, String nickname, String imageUrl, DepartmentType position, DurationType workingYear, String company, String story, boolean certified, int workchats, List activities) { + private MyProfileResponse(long id, String nickname, String imageUrl, DepartmentType position, + DurationType workingYear, String company, String story, boolean certified, int workchats, + List activities) { this.id = id; this.nickname = nickname; this.imageUrl = imageUrl; @@ -63,7 +66,9 @@ private MyProfileResponse(long id, String nickname, String imageUrl, DepartmentT } public static MyProfileResponse of(UserProfile userProfile, int workchats, List activities) { - return new MyProfileResponse(userProfile.getId(), userProfile.getNickname(), userProfile.getImageUrl(), userProfile.getPosition(), userProfile.getWorkingYear(), userProfile.getCompany(), userProfile.getStory(), userProfile.isCertified(), workchats, activities); + return new MyProfileResponse(userProfile.getId(), userProfile.getNickname(), userProfile.getImageUrl(), + userProfile.getPosition(), userProfile.getWorkingYear(), userProfile.getCompany(), userProfile.getStory(), + userProfile.isCertified(), workchats, activities); } }