Merge pull request #6 from 23-Samsung-Securities/feat/apartment

feat: 내 집 마련 공식 API
23-Samsung-Securities · Dec 5, 2023 · 4663a93 · 4663a93
2 parents c08dedc + 6d8bb36
commit 4663a93
Show file tree

Hide file tree

Showing 20 changed files with 7 additions and 4 deletions.
diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin
diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock
diff --git a/.gradle/8.5/fileHashes/fileHashes.bin b/.gradle/8.5/fileHashes/fileHashes.bin
diff --git a/.gradle/8.5/fileHashes/fileHashes.lock b/.gradle/8.5/fileHashes/fileHashes.lock
diff --git a/.gradle/8.5/fileHashes/resourceHashesCache.bin b/.gradle/8.5/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/...asses/java/main/com/samsung/samsung/domain/apartment/controller/ApartmentController.class b/...asses/java/main/com/samsung/samsung/domain/apartment/controller/ApartmentController.class
diff --git a/build/classes/java/main/com/samsung/samsung/domain/apartment/service/ApartmentService.class b/build/classes/java/main/com/samsung/samsung/domain/apartment/service/ApartmentService.class
diff --git a/...d/classes/java/main/com/samsung/samsung/domain/product/controller/ProductController.class b/...d/classes/java/main/com/samsung/samsung/domain/product/controller/ProductController.class
diff --git a/build/classes/java/main/com/samsung/samsung/domain/product/dto/ProductDto$Request.class b/build/classes/java/main/com/samsung/samsung/domain/product/dto/ProductDto$Request.class
diff --git a/build/classes/java/main/com/samsung/samsung/domain/product/dto/ProductDto$Response.class b/build/classes/java/main/com/samsung/samsung/domain/product/dto/ProductDto$Response.class
diff --git a/.../classes/java/main/com/samsung/samsung/domain/product/entity/Product$ProductBuilder.class b/.../classes/java/main/com/samsung/samsung/domain/product/entity/Product$ProductBuilder.class
diff --git a/build/classes/java/main/com/samsung/samsung/domain/product/entity/Product.class b/build/classes/java/main/com/samsung/samsung/domain/product/entity/Product.class
diff --git a/...d/classes/java/main/com/samsung/samsung/domain/product/repository/ProductRepository.class b/...d/classes/java/main/com/samsung/samsung/domain/product/repository/ProductRepository.class
diff --git a/build/classes/java/main/com/samsung/samsung/domain/product/service/ProductService.class b/build/classes/java/main/com/samsung/samsung/domain/product/service/ProductService.class
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ApartmentController.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/ApartmentController.class.uniqueId1
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ApartmentService.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/ApartmentService.class.uniqueId0
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/src/main/java/com/samsung/samsung/domain/apartment/controller/ApartmentController.java b/src/main/java/com/samsung/samsung/domain/apartment/controller/ApartmentController.java
@@ -24,7 +24,7 @@ public BaseResponse<List<ApartmentDto.Response>> getProductList(){
         return BaseResponse.onSuccess(apartmentList);
     }
     @GetMapping("/{apartment-Id}/{goal-Year}")
-    public BaseResponse<Long> getMyHomeResult(@PathVariable("apartment-Id") Long id , @PathVariable("goal-Year") int goalYear){
+    public BaseResponse<Double> getMyHomeResult(@PathVariable("apartment-Id") Long id , @PathVariable("goal-Year") int goalYear){
         return BaseResponse.onSuccess(apartmentService.findByHome(id , goalYear));
     }
 //TODO

diff --git a/src/main/java/com/samsung/samsung/domain/apartment/service/ApartmentService.java b/src/main/java/com/samsung/samsung/domain/apartment/service/ApartmentService.java
@@ -22,11 +22,14 @@ public List<ApartmentDto.Response> findByAll() {
                 .map(ApartmentDto.Response::new)
                 .collect(Collectors.toList());
     }
-    public Long findByHome(Long id, int goalYear){
+    public static double calculateExpression(double a, double b, double n) {
+        return Math.pow(a / b, 1.0 / n) - 1;
+    }
+    public Double findByHome(Long id, int goalYear){
         //(현재 집 시세 - 현재 자산) / (수익 - 필수 소비 금액)
         Apartment apartment = apartmentRepository.findById(id).orElseThrow(() -> new IllegalArgumentException("해당 아파트가 존재하지 않습니다."));
         long apartmentPrice = Long.parseLong(apartment.getPrice());
-        long result = (apartmentPrice - 200000000) / (400 - 80);
-        return result/goalYear;
+
+        return calculateExpression(apartmentPrice,15000000,goalYear) * 100;
     }
 }