style: 컨벤션 설정

whatever-mentoring · Aug 17, 2024 · 1724925 · 1724925
1 parent 9c9e11e
commit 1724925
Show file tree

Hide file tree

Showing 7 changed files with 153 additions and 149 deletions.
diff --git a/src/main/java/com/seulseul/seulseul/config/CustomExceptionHandler.java b/src/main/java/com/seulseul/seulseul/config/CustomExceptionHandler.java
@@ -1,6 +1,6 @@
 package com.seulseul.seulseul.config;
 
-import com.seulseul.seulseul.dto.Response.ResponseData;
+import com.seulseul.seulseul.dto.response.ResponseData;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;

diff --git a/src/main/java/com/seulseul/seulseul/controller/alarm/AlarmController.java b/src/main/java/com/seulseul/seulseul/controller/alarm/AlarmController.java
@@ -46,8 +46,8 @@ public class AlarmController {
 	@PostMapping("/v1/alarm")
 	public ResponseEntity<ResponseData> createAlarm(@RequestBody AlarmReqDto dto,
 		@RequestHeader("Auth") UUID uuid) throws IOException, ParseException {
-		User user = userService.getUserByUuid(uuid);
-		BaseRoute baseRoute = baseRouteService.findByUser(user);
+		User user = userService.findUserByUuid(uuid);
+		BaseRoute baseRoute = baseRouteService.findBaseRouteByUser(user);
 
 		//알람 저장
 		AlarmDto alarmDto = alarmService.saveAlarm(dto, user);
@@ -78,14 +78,14 @@ public ResponseEntity<ResponseData> createAlarm(@RequestBody AlarmReqDto dto,
 	@PatchMapping("/v1/alarm")
 	public ResponseEntity<ResponseData> updateAlarm(@RequestBody AlarmUpdateDto updateDto,
 		@RequestHeader("Auth") UUID uuid) throws IOException, ParseException {
-		User user = userService.getUserByUuid(uuid);
-		BaseRoute baseRoute = baseRouteService.findByUser(user);
+		User user = userService.findUserByUuid(uuid);
+		BaseRoute baseRoute = baseRouteService.findBaseRouteByUser(user);
 
 		//알람 수정
 		AlarmDto alarmDto = alarmService.updateAlarm(updateDto, user);
 
 		//<추가>baseRoute 경로 설정
-		RouteDetailDto routeDetailDto = updateResultService.getUpdatedResult(baseRoute.getId());
+		RouteDetailDto routeDetailDto = updateResultService.findUpdatedResult(baseRoute.getId());
 		RouteDetailWrapDto wrapDto = new RouteDetailWrapDto();
 		// RouteDetail DB에 저장
 		RouteDetail routeDetail = routeDetailService.saveRouteDetail(routeDetailDto, baseRoute);
@@ -106,7 +106,7 @@ public ResponseEntity<ResponseData> updateAlarm(@RequestBody AlarmUpdateDto upda
 
 	@PatchMapping("/v1/alarm/enabled/{id}")
 	public ResponseEntity<ResponseData> updateAlarm(@RequestHeader("Auth") UUID uuid, @PathVariable("id") Long id) {
-		User user = userService.getUserByUuid(uuid);
+		User user = userService.findUserByUuid(uuid);
 		AlarmDto alarmDto = alarmService.updateAlarmEnabled(id, user);
 		ResponseData responseData = new ResponseData(200, alarmDto);
 		return new ResponseEntity<>(responseData, HttpStatus.OK);

diff --git a/src/main/java/com/seulseul/seulseul/dto/Response/ResponseData.java b/src/main/java/com/seulseul/seulseul/dto/Response/ResponseData.java
diff --git a/src/main/java/com/seulseul/seulseul/dto/response/ResponseData.java b/src/main/java/com/seulseul/seulseul/dto/response/ResponseData.java
@@ -0,0 +1,16 @@
+package com.seulseul.seulseul.dto.response;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class ResponseData {
+	private int code;
+	private Object data;
+
+	public ResponseData(int code, Object data) {
+		this.code = code;
+		this.data = data;
+	}
+}
diff --git a/src/main/java/com/seulseul/seulseul/dto/stopTimeList/StopTimeDto.java b/src/main/java/com/seulseul/seulseul/dto/stopTimeList/StopTimeDto.java
@@ -1,79 +1,80 @@
 package com.seulseul.seulseul.dto.stopTimeList;
 
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 @Getter
 public class StopTimeDto {
-    private Result result;
-
-    @Getter
-    @NoArgsConstructor
-    public class Result {
-        @JsonProperty("OrdList")
-        private OrdList ordList;
-        @JsonProperty("SatList")
-        private SatList satList;
-
-        @JsonProperty("SunList")
-        private SunList sunList;
-
-    }
-
-    @Getter
-    @NoArgsConstructor
-    public class OrdList {
-        @JsonProperty("up")
-        private Up up;
-
-        @JsonProperty("down")
-        private Down down;
-
-    }
-    @Getter
-    @NoArgsConstructor
-    public class SatList {
-        @JsonProperty("up")
-        private Up up;
-
-        @JsonProperty("down")
-        private Down down;
-    }
-
-    @Getter
-    @NoArgsConstructor
-    public class SunList {
-        @JsonProperty("up")
-        private Up up;
-
-        @JsonProperty("down")
-        private Down down;
-    }
-    @Getter
-    @NoArgsConstructor
-    public class Up {
-        @JsonProperty("time")
-        private List<Time> time;
-    }
-
-    @Getter
-    @NoArgsConstructor
-    public class Down {
-        @JsonProperty("time")
-        private List<Time> time;
-    }
-
-    @Getter
-    @NoArgsConstructor
-    public class Time {
-        @JsonProperty("idx")
-        private Integer idx;
-        @JsonProperty("list")
-        private String list;
-    }
-
-
+	private Result result;
+
+	@Getter
+	@NoArgsConstructor
+	public class Result {
+		@JsonProperty("OrdList")
+		private OrdList ordList;
+		@JsonProperty("SatList")
+		private SatList satList;
+
+		@JsonProperty("SunList")
+		private SunList sunList;
+
+	}
+
+	@Getter
+	@NoArgsConstructor
+	public class OrdList {
+		@JsonProperty("up")
+		private Up up;
+
+		@JsonProperty("down")
+		private Down down;
+
+	}
+
+	@Getter
+	@NoArgsConstructor
+	public class SatList {
+		@JsonProperty("up")
+		private Up up;
+
+		@JsonProperty("down")
+		private Down down;
+	}
+
+	@Getter
+	@NoArgsConstructor
+	public class SunList {
+		@JsonProperty("up")
+		private Up up;
+
+		@JsonProperty("down")
+		private Down down;
+	}
+
+	@Getter
+	@NoArgsConstructor
+	public class Up {
+		@JsonProperty("time")
+		private List<Time> time;
+	}
+
+	@Getter
+	@NoArgsConstructor
+	public class Down {
+		@JsonProperty("time")
+		private List<Time> time;
+	}
+
+	@Getter
+	@NoArgsConstructor
+	public class Time {
+		@JsonProperty("idx")
+		private Integer idx;
+		@JsonProperty("list")
+		private String list;
+	}
 }
diff --git a/src/main/java/com/seulseul/seulseul/dto/transferInfo/TransferInfoJsonDto.java b/src/main/java/com/seulseul/seulseul/dto/transferInfo/TransferInfoJsonDto.java
@@ -1,33 +1,34 @@
 package com.seulseul.seulseul.dto.transferInfo;
 
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Getter
 public class TransferInfoJsonDto {
-    private Result result;
+	private Result result;
 
-    @Getter
-    @NoArgsConstructor
-    public static class Result {
-        private ExChangeInfoSet exChangeInfoSet;
-    }
+	@Getter
+	@NoArgsConstructor
+	public static class Result {
+		private ExChangeInfoSet exChangeInfoSet;
+	}
 
-    @Getter
-    @NoArgsConstructor
-    public static class ExChangeInfoSet {
-        private List<ExChangeInfo> exChangeInfo;
-    }
+	@Getter
+	@NoArgsConstructor
+	public static class ExChangeInfoSet {
+		private List<ExChangeInfo> exChangeInfo;
+	}
 
-    @Getter
-    @NoArgsConstructor
-    public static class ExChangeInfo {
-        private String exName;
-        private int exWalkTime;
-        private int exSID;
-    }
+	@Getter
+	@NoArgsConstructor
+	public static class ExChangeInfo {
+		private String exName;
+		private int exWalkTime;
+		private int exSID;
+	}
 }
diff --git a/src/main/java/com/seulseul/seulseul/entity/alarm/Alarm.java b/src/main/java/com/seulseul/seulseul/entity/alarm/Alarm.java
@@ -1,46 +1,48 @@
 package com.seulseul.seulseul.entity.alarm;
 
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
 @NoArgsConstructor
 public class Alarm {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "alarm_id")
-    private Long id;
-
-    private boolean alarmEnabled;
-
-    private Long alarmTime;
-
-    private int alarmTerm;
-
-    public Alarm(Long alarmTime, int alarmTerm) {
-        this.alarmEnabled = true;
-        this.alarmTime = alarmTime;
-        this.alarmTerm = alarmTerm;
-    }
-
-    public void updateAlarm(Long alarmTime, int alarmTerm) {
-        this.alarmTime = alarmTime;
-        this.alarmTerm = alarmTerm;
-    }
-
-    public void updateAlarmEnabled(boolean alarmEnabled) {
-        if (alarmEnabled == true) {
-            this.alarmEnabled = false;
-        }
-        else {
-            this.alarmEnabled = true;
-        }
-    }
-
-    public void setAlarmEnabled() {
-        this.alarmEnabled = false;
-    }
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "alarm_id")
+	private Long id;
+
+	private boolean alarmEnabled;
+
+	private Long alarmTime;
+
+	private int alarmTerm;
+
+	public Alarm(Long alarmTime, int alarmTerm) {
+		this.alarmEnabled = true;
+		this.alarmTime = alarmTime;
+		this.alarmTerm = alarmTerm;
+	}
+
+	public void updateAlarm(Long alarmTime, int alarmTerm) {
+		this.alarmTime = alarmTime;
+		this.alarmTerm = alarmTerm;
+	}
+
+	public void updateAlarmEnabled(boolean alarmEnabled) {
+		if (alarmEnabled == true) {
+			this.alarmEnabled = false;
+		} else {
+			this.alarmEnabled = true;
+		}
+	}
+
+	public void setAlarmEnabled() {
+		this.alarmEnabled = false;
+	}
 }