Skip to content

Commit ece773f

Browse files
authored
Merge pull request #257 from DevKor-github/develop
오류 로그 수정 시도
2 parents 0587438 + 441527a commit ece773f

File tree

7 files changed

+98
-1
lines changed

7 files changed

+98
-1
lines changed

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
FROM amazoncorretto:17-alpine
2+
VOLUME /tmp
3+
RUN mkdir -p /app/temp && chmod 777 /app/temp
24
COPY build/libs/team-c-back-0.0.1-SNAPSHOT.jar app.jar
3-
ENTRYPOINT ["java", "-jar", "app.jar"]
5+
ENTRYPOINT ["java", "-Djava.io.tmpdir=/app/temp", "-jar", "app.jar"]

src/main/java/devkor/com/teamcback/domain/building/entity/BuildingImage.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ public class BuildingImage {
3434
@JoinColumn(name = "building_id")
3535
private Building building;
3636

37+
private Double leftTopLat;
38+
private Double leftTopLong;
39+
private Double rightBottomLat;
40+
private Double rightBottomLong;
41+
3742
public BuildingImage(Double floor, String imageUrl, Building building) {
3843
this.floor = floor;
3944
this.image = imageUrl;
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package devkor.com.teamcback.domain.notification.controller;
2+
3+
import devkor.com.teamcback.domain.koyeon.entity.Koyeon;
4+
import devkor.com.teamcback.domain.notification.service.VersionService;
5+
import devkor.com.teamcback.global.response.CommonResponse;
6+
import io.swagger.v3.oas.annotations.Operation;
7+
import io.swagger.v3.oas.annotations.media.Content;
8+
import io.swagger.v3.oas.annotations.media.Schema;
9+
import io.swagger.v3.oas.annotations.responses.ApiResponse;
10+
import io.swagger.v3.oas.annotations.responses.ApiResponses;
11+
import lombok.RequiredArgsConstructor;
12+
import org.springframework.web.bind.annotation.GetMapping;
13+
import org.springframework.web.bind.annotation.RequestMapping;
14+
import org.springframework.web.bind.annotation.RestController;
15+
16+
@RestController
17+
@RequiredArgsConstructor
18+
@RequestMapping("/api/notifications/version")
19+
public class VersionController {
20+
21+
private final VersionService versionService;
22+
23+
/***
24+
* 앱 버전 조회
25+
*/
26+
@GetMapping("")
27+
@Operation(summary = "앱 버전 조회", description = "버전 다른 경우 업데이트 필요 알림")
28+
@ApiResponses(value = {
29+
@ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
30+
@ApiResponse(responseCode = "404", description = "Not Found",
31+
content = @Content(schema = @Schema(implementation = CommonResponse.class))),
32+
})
33+
public CommonResponse<String> getVersion() {
34+
return CommonResponse.success(versionService.getVersion());
35+
}
36+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package devkor.com.teamcback.domain.notification.entity;
2+
3+
import jakarta.persistence.*;
4+
import lombok.Getter;
5+
import lombok.NoArgsConstructor;
6+
7+
@Entity
8+
@Getter
9+
@Table(name = "tb_version")
10+
@NoArgsConstructor
11+
public class Version {
12+
13+
@Id
14+
@GeneratedValue(strategy = GenerationType.IDENTITY)
15+
private Long id;
16+
17+
@Column(nullable = false)
18+
private String version;
19+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package devkor.com.teamcback.domain.notification.repository;
2+
3+
import devkor.com.teamcback.domain.notification.entity.Version;
4+
import org.springframework.data.jpa.repository.JpaRepository;
5+
6+
public interface VersionRepository extends JpaRepository<Version, Long> {
7+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package devkor.com.teamcback.domain.notification.service;
2+
3+
import devkor.com.teamcback.domain.koyeon.entity.Koyeon;
4+
import devkor.com.teamcback.domain.notification.entity.Version;
5+
import devkor.com.teamcback.domain.notification.repository.VersionRepository;
6+
import devkor.com.teamcback.domain.schoolcalendar.entity.SchoolCalendar;
7+
import lombok.RequiredArgsConstructor;
8+
import org.springframework.stereotype.Service;
9+
import org.springframework.transaction.annotation.Transactional;
10+
11+
@Service
12+
@RequiredArgsConstructor
13+
public class VersionService {
14+
15+
private final VersionRepository versionRepository;
16+
17+
/**
18+
* 고연전 여부 확인
19+
*/
20+
@Transactional(readOnly = true)
21+
public String getVersion() {
22+
Version version = versionRepository.findById(1L).orElse(null);
23+
24+
if (version == null) return "";
25+
return version.getVersion();
26+
}
27+
}

src/main/resources/application.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ spring:
2626

2727
servlet:
2828
multipart:
29+
location: /app/temp
2930
max-file-size: 5MB
3031
max-request-size: 50MB
3132

0 commit comments

Comments
 (0)