Merge branch 'main' of https://github.com/Lazy-Mechanics/dduck_ddak_b…

…ackend

src/main/java/com/dduckddak/domain/data/controller/FacilityController.java → src/main/java/com/dduckddak/domain/data/facility/controller/FacilityController.java

@@ -1,9 +1,9 @@
-package com.dduckddak.domain.data.controller;
+package com.dduckddak.domain.data.facility.controller;
 
 
-import com.dduckddak.domain.data.dto.FacilityByDistrictResponse;
-import com.dduckddak.domain.data.dto.FacilityDto;
-import com.dduckddak.domain.data.service.FacilityService;
+import com.dduckddak.domain.data.facility.dto.FacilityByDistrictResponse;
+import com.dduckddak.domain.data.facility.dto.FacilityDto;
+import com.dduckddak.domain.data.facility.service.FacilityService;
 import com.dduckddak.global.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/dduckddak/domain/data/dto/FacilityByDistrictResponse.java → src/main/java/com/dduckddak/domain/data/facility/dto/FacilityByDistrictResponse.java

@@ -1,7 +1,6 @@
-package com.dduckddak.domain.data.dto;
+package com.dduckddak.domain.data.facility.dto;
 
 
-import com.dduckddak.domain.data.model.Facility;
 import com.querydsl.core.annotations.QueryProjection;
 import lombok.Builder;
 import lombok.Getter;

src/main/java/com/dduckddak/domain/data/dto/FacilityDto.java → src/main/java/com/dduckddak/domain/data/facility/dto/FacilityDto.java

@@ -1,10 +1,9 @@
-package com.dduckddak.domain.data.dto;
+package com.dduckddak.domain.data.facility.dto;
 
 
-import com.dduckddak.domain.data.model.Facility;
+import com.dduckddak.domain.data.facility.model.Facility;
 import lombok.Builder;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 @Getter
 @Builder

src/main/java/com/dduckddak/domain/data/model/Facility.java → src/main/java/com/dduckddak/domain/data/facility/model/Facility.java

@@ -1,4 +1,4 @@
-package com.dduckddak.domain.data.model;
+package com.dduckddak.domain.data.facility.model;
 
 import com.dduckddak.domain.town.model.Town;
 import jakarta.persistence.*;

src/main/java/com/dduckddak/domain/data/repository/FacilityBulkRepository.java → src/main/java/com/dduckddak/domain/data/facility/repository/FacilityBulkRepository.java

@@ -1,7 +1,6 @@
-package com.dduckddak.domain.data.repository;
+package com.dduckddak.domain.data.facility.repository;
 
-import com.dduckddak.domain.data.model.Facility;
-import com.dduckddak.domain.data.model.Sales;
+import com.dduckddak.domain.data.facility.model.Facility;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.jdbc.core.JdbcTemplate;

src/main/java/com/dduckddak/domain/data/repository/FacilityRepository.java → src/main/java/com/dduckddak/domain/data/facility/repository/FacilityRepository.java

@@ -1,7 +1,6 @@
-package com.dduckddak.domain.data.repository;
+package com.dduckddak.domain.data.facility.repository;
 
-import com.dduckddak.domain.data.model.Facility;
-import com.dduckddak.domain.data.model.Finance;
+import com.dduckddak.domain.data.facility.model.Facility;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface FacilityRepository extends JpaRepository<Facility, Long>, FacilityRepositoryCustom {

src/main/java/com/dduckddak/domain/data/facility/repository/FacilityRepositoryCustom.java

@@ -0,0 +1,11 @@
+package com.dduckddak.domain.data.facility.repository;
+
+import com.dduckddak.domain.data.facility.dto.FacilityByDistrictResponse;
+import com.dduckddak.domain.data.facility.model.Facility;
+
+public interface FacilityRepositoryCustom {
+
+    Facility findByTownCodeAndQuarter(String code);
+
+    FacilityByDistrictResponse findRecentByDistrict(String district);
+}

src/main/java/com/dduckddak/domain/data/repository/FacilityRepositoryImpl.java → src/main/java/com/dduckddak/domain/data/facility/repository/FacilityRepositoryImpl.java

@@ -1,20 +1,14 @@
-package com.dduckddak.domain.data.repository;
+package com.dduckddak.domain.data.facility.repository;
 
-import com.dduckddak.domain.data.dto.FacilityByDistrictResponse;
-import com.dduckddak.domain.data.dto.QFacilityByDistrictResponse;
-import com.dduckddak.domain.data.dto.QPopulationByDistrictResponse;
-import com.dduckddak.domain.data.model.Facility;
-import com.dduckddak.domain.data.model.Population;
-import com.dduckddak.domain.data.model.PopulationType;
+import com.dduckddak.domain.data.facility.dto.FacilityByDistrictResponse;
+import com.dduckddak.domain.data.facility.dto.QFacilityByDistrictResponse;
+import com.dduckddak.domain.data.facility.model.Facility;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 
-import java.util.List;
-
-import static com.dduckddak.domain.data.model.QFacility.facility;
-import static com.dduckddak.domain.data.model.QPopulation.population;
+import static com.dduckddak.domain.data.facility.model.QFacility.facility;
 import static com.dduckddak.domain.town.model.QTown.town;
 
 @RequiredArgsConstructor

src/main/java/com/dduckddak/domain/data/service/FacilityService.java → src/main/java/com/dduckddak/domain/data/facility/service/FacilityService.java

@@ -1,9 +1,9 @@
-package com.dduckddak.domain.data.service;
+package com.dduckddak.domain.data.facility.service;
 
-import com.dduckddak.domain.data.dto.FacilityByDistrictResponse;
-import com.dduckddak.domain.data.dto.FacilityDto;
-import com.dduckddak.domain.data.model.Facility;
-import com.dduckddak.domain.data.repository.FacilityRepository;
+import com.dduckddak.domain.data.facility.dto.FacilityByDistrictResponse;
+import com.dduckddak.domain.data.facility.dto.FacilityDto;
+import com.dduckddak.domain.data.facility.model.Facility;
+import com.dduckddak.domain.data.facility.repository.FacilityRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/com/dduckddak/domain/data/model/Finance.java → src/main/java/com/dduckddak/domain/data/finance/model/Finance.java

@@ -1,4 +1,4 @@
-package com.dduckddak.domain.data.model;
+package com.dduckddak.domain.data.finance.model;
 
 import com.dduckddak.domain.town.model.Town;
 import jakarta.persistence.*;

src/main/java/com/dduckddak/domain/data/repository/FinanceBulkRepository.java → src/main/java/com/dduckddak/domain/data/finance/repository/FinanceBulkRepository.java

@@ -1,8 +1,7 @@
-package com.dduckddak.domain.data.repository;
+package com.dduckddak.domain.data.finance.repository;
 
 
-import com.dduckddak.domain.data.model.Finance;
-import com.dduckddak.domain.data.model.Population;
+import com.dduckddak.domain.data.finance.model.Finance;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.jdbc.core.JdbcTemplate;

src/main/java/com/dduckddak/domain/data/repository/FinanceRepository.java → src/main/java/com/dduckddak/domain/data/finance/repository/FinanceRepository.java

@@ -1,6 +1,6 @@
-package com.dduckddak.domain.data.repository;
+package com.dduckddak.domain.data.finance.repository;
 
-import com.dduckddak.domain.data.model.Finance;
+import com.dduckddak.domain.data.finance.model.Finance;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface FinanceRepository extends JpaRepository<Finance, Long> {

src/main/java/com/dduckddak/domain/data/dto/MarketAnalysisResponse.java → src/main/java/com/dduckddak/domain/data/markettrends/dto/MarketAnalysisResponse.java

@@ -1,4 +1,4 @@
-package com.dduckddak.domain.data.dto;
+package com.dduckddak.domain.data.markettrends.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/dduckddak/domain/data/dto/MarketTrendsResponse.java → src/main/java/com/dduckddak/domain/data/markettrends/dto/MarketTrendsResponse.java

@@ -1,4 +1,4 @@
-package com.dduckddak.domain.data.dto;
+package com.dduckddak.domain.data.markettrends.dto;
 
 import lombok.Builder;
 import lombok.Getter;

src/main/java/com/dduckddak/domain/data/model/MarketTrends.java → src/main/java/com/dduckddak/domain/data/markettrends/model/MarketTrends.java

@@ -1,4 +1,4 @@
-package com.dduckddak.domain.data.model;
+package com.dduckddak.domain.data.markettrends.model;
 
 import com.dduckddak.domain.town.model.Town;
 import jakarta.persistence.*;

src/main/java/com/dduckddak/domain/data/repository/MarketTrendRepository.java → src/main/java/com/dduckddak/domain/data/markettrends/repository/MarketTrendRepository.java

@@ -1,6 +1,6 @@
-package com.dduckddak.domain.data.repository;
+package com.dduckddak.domain.data.markettrends.repository;
 
-import com.dduckddak.domain.data.model.MarketTrends;
+import com.dduckddak.domain.data.markettrends.model.MarketTrends;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface MarketTrendRepository extends JpaRepository<MarketTrends, Integer>, MarketTrendRepositoryCustom {

src/main/java/com/dduckddak/domain/data/repository/MarketTrendRepositoryCustom.java → src/main/java/com/dduckddak/domain/data/markettrends/repository/MarketTrendRepositoryCustom.java

@@ -1,6 +1,6 @@
-package com.dduckddak.domain.data.repository;
+package com.dduckddak.domain.data.markettrends.repository;
 
-import com.dduckddak.domain.data.model.MarketTrends;
+import com.dduckddak.domain.data.markettrends.model.MarketTrends;
 
 import java.util.List;
 

src/main/java/com/dduckddak/domain/data/repository/MarketTrendRepositoryImpl.java → src/main/java/com/dduckddak/domain/data/markettrends/repository/MarketTrendRepositoryImpl.java

@@ -1,12 +1,11 @@
-package com.dduckddak.domain.data.repository;
+package com.dduckddak.domain.data.markettrends.repository;
 
-import com.dduckddak.domain.data.model.MarketTrends;
+import com.dduckddak.domain.data.markettrends.model.MarketTrends;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
-
 import java.util.List;
 
-import static com.dduckddak.domain.data.model.QMarketTrends.marketTrends;
+import static com.dduckddak.domain.data.markettrends.model.QMarketTrends.marketTrends;
 
 public class MarketTrendRepositoryImpl implements MarketTrendRepositoryCustom {
     private final JPAQueryFactory queryFactory;

src/main/java/com/dduckddak/domain/data/repository/MarketTrendsBulkRepository.java → src/main/java/com/dduckddak/domain/data/markettrends/repository/MarketTrendsBulkRepository.java

@@ -1,7 +1,6 @@
-package com.dduckddak.domain.data.repository;
+package com.dduckddak.domain.data.markettrends.repository;
 
-import com.dduckddak.domain.data.model.Facility;
-import com.dduckddak.domain.data.model.MarketTrends;
+import com.dduckddak.domain.data.markettrends.model.MarketTrends;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.jdbc.core.JdbcTemplate;

src/main/java/com/dduckddak/domain/member/controller/ScrapController.java → src/main/java/com/dduckddak/domain/data/member/controller/ScrapController.java

@@ -1,8 +1,8 @@
-package com.dduckddak.domain.member.controller;
+package com.dduckddak.domain.data.member.controller;
 
-import com.dduckddak.domain.member.controller.dto.ScrapRequest;
-import com.dduckddak.domain.member.controller.dto.ScrapResponse;
-import com.dduckddak.domain.member.service.ScrapService;
+import com.dduckddak.domain.data.member.controller.dto.ScrapRequest;
+import com.dduckddak.domain.data.member.controller.dto.ScrapResponse;
+import com.dduckddak.domain.data.member.service.ScrapService;
 import com.dduckddak.global.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/dduckddak/domain/member/controller/dto/ScrapRequest.java → src/main/java/com/dduckddak/domain/data/member/controller/dto/ScrapRequest.java

@@ -1,4 +1,4 @@
-package com.dduckddak.domain.member.controller.dto;
+package com.dduckddak.domain.data.member.controller.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/dduckddak/domain/member/controller/dto/ScrapResponse.java → src/main/java/com/dduckddak/domain/data/member/controller/dto/ScrapResponse.java

@@ -1,4 +1,4 @@
-package com.dduckddak.domain.member.controller.dto;
+package com.dduckddak.domain.data.member.controller.dto;
 
 import lombok.AccessLevel;
 import lombok.Getter;

src/main/java/com/dduckddak/domain/member/model/Member.java → src/main/java/com/dduckddak/domain/data/member/model/Member.java

@@ -1,4 +1,4 @@
-package com.dduckddak.domain.member.model;
+package com.dduckddak.domain.data.member.model;
 
 import jakarta.persistence.*;
 import lombok.AccessLevel;

src/main/java/com/dduckddak/domain/member/model/MemberRole.java → src/main/java/com/dduckddak/domain/data/member/model/MemberRole.java

@@ -1,4 +1,4 @@
-package com.dduckddak.domain.member.model;
+package com.dduckddak.domain.data.member.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/dduckddak/domain/member/model/Scrap.java → src/main/java/com/dduckddak/domain/data/member/model/Scrap.java

@@ -1,6 +1,6 @@
-package com.dduckddak.domain.member.model;
+package com.dduckddak.domain.data.member.model;
 
-import com.dduckddak.domain.member.controller.dto.ScrapRequest;
+import com.dduckddak.domain.data.member.controller.dto.ScrapRequest;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;

src/main/java/com/dduckddak/domain/member/repository/MemberRepository.java → src/main/java/com/dduckddak/domain/data/member/repository/MemberRepository.java

@@ -1,6 +1,6 @@
-package com.dduckddak.domain.member.repository;
+package com.dduckddak.domain.data.member.repository;
 
-import com.dduckddak.domain.member.model.Member;
+import com.dduckddak.domain.data.member.model.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/dduckddak/domain/member/repository/ScrapRepository.java → src/main/java/com/dduckddak/domain/data/member/repository/ScrapRepository.java

@@ -1,6 +1,6 @@
-package com.dduckddak.domain.member.repository;
+package com.dduckddak.domain.data.member.repository;
 
-import com.dduckddak.domain.member.model.Scrap;
+import com.dduckddak.domain.data.member.model.Scrap;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

src/main/java/com/dduckddak/domain/member/service/ScrapService.java → src/main/java/com/dduckddak/domain/data/member/service/ScrapService.java

@@ -1,11 +1,11 @@
-package com.dduckddak.domain.member.service;
-
-import com.dduckddak.domain.member.controller.dto.ScrapRequest;
-import com.dduckddak.domain.member.controller.dto.ScrapResponse;
-import com.dduckddak.domain.member.model.Member;
-import com.dduckddak.domain.member.model.Scrap;
-import com.dduckddak.domain.member.repository.MemberRepository;
-import com.dduckddak.domain.member.repository.ScrapRepository;
+package com.dduckddak.domain.data.member.service;
+
+import com.dduckddak.domain.data.member.repository.MemberRepository;
+import com.dduckddak.domain.data.member.repository.ScrapRepository;
+import com.dduckddak.domain.data.member.controller.dto.ScrapRequest;
+import com.dduckddak.domain.data.member.controller.dto.ScrapResponse;
+import com.dduckddak.domain.data.member.model.Member;
+import com.dduckddak.domain.data.member.model.Scrap;
 import com.dduckddak.domain.town.model.Town;
 import com.dduckddak.domain.town.repository.TownRepository;
 import lombok.RequiredArgsConstructor;

src/main/java/com/dduckddak/domain/data/controller/PopulationController.java → src/main/java/com/dduckddak/domain/data/population/controller/PopulationController.java

@@ -1,8 +1,8 @@
-package com.dduckddak.domain.data.controller;
+package com.dduckddak.domain.data.population.controller;
 
-import com.dduckddak.domain.data.dto.*;
-import com.dduckddak.domain.data.model.PopulationType;
-import com.dduckddak.domain.data.service.PopulationService;
+import com.dduckddak.domain.data.population.dto.*;
+import com.dduckddak.domain.data.population.model.PopulationType;
+import com.dduckddak.domain.data.population.service.PopulationService;
 import com.dduckddak.global.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/dduckddak/domain/data/dto/PopulationByDistrictResponse.java → src/main/java/com/dduckddak/domain/data/population/dto/PopulationByDistrictResponse.java

@@ -1,4 +1,4 @@
-package com.dduckddak.domain.data.dto;
+package com.dduckddak.domain.data.population.dto;
 
 import com.querydsl.core.annotations.QueryProjection;
 import lombok.AccessLevel;

src/main/java/com/dduckddak/domain/data/dto/PopulationByQuarterDto.java → src/main/java/com/dduckddak/domain/data/population/dto/PopulationByQuarterDto.java

@@ -1,6 +1,6 @@
-package com.dduckddak.domain.data.dto;
+package com.dduckddak.domain.data.population.dto;
 
-import com.dduckddak.domain.data.model.Population;
+import com.dduckddak.domain.data.population.model.Population;
 
 import java.util.List;
 

src/main/java/com/dduckddak/domain/data/dto/PopulationTransitionResponse.java → src/main/java/com/dduckddak/domain/data/population/dto/PopulationTransitionResponse.java

@@ -1,13 +1,12 @@
-package com.dduckddak.domain.data.dto;
-
-import com.dduckddak.domain.data.model.Population;
+package com.dduckddak.domain.data.population.dto;
 
 import java.util.List;
 
 public record PopulationTransitionResponse(
         List<PopulationData> populationList
 ) {
     public record PopulationData(
+            String townName,
             long quarter,
             long populationOfTown,
             int rankAtCity,

src/main/java/com/dduckddak/domain/data/dto/PopulationsTop10Response.java → src/main/java/com/dduckddak/domain/data/population/dto/PopulationsTop10Response.java

@@ -1,4 +1,4 @@
-package com.dduckddak.domain.data.dto;
+package com.dduckddak.domain.data.population.dto;
 
 
 import lombok.Builder;

src/main/java/com/dduckddak/domain/data/dto/TimelyDto.java → src/main/java/com/dduckddak/domain/data/population/dto/TimelyDto.java

@@ -1,6 +1,7 @@
-package com.dduckddak.domain.data.dto;
+package com.dduckddak.domain.data.population.dto;
 
-import com.dduckddak.domain.data.model.Population;
+import com.dduckddak.domain.data.population.model.Population;
+import com.dduckddak.domain.data.sales.dto.RecentlySalesDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/dduckddak/domain/data/model/Population.java → src/main/java/com/dduckddak/domain/data/population/model/Population.java

@@ -1,7 +1,6 @@
-package com.dduckddak.domain.data.model;
+package com.dduckddak.domain.data.population.model;
 
 import com.dduckddak.domain.town.model.Town;
-import com.dduckddak.domain.town.model.TownIndustry;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;

src/main/java/com/dduckddak/domain/data/model/PopulationType.java → src/main/java/com/dduckddak/domain/data/population/model/PopulationType.java

@@ -1,4 +1,4 @@
-package com.dduckddak.domain.data.model;
+package com.dduckddak.domain.data.population.model;
 
 import lombok.Getter;
 

src/main/java/com/dduckddak/domain/data/repository/PopulationBulkRepository.java → src/main/java/com/dduckddak/domain/data/population/repository/PopulationBulkRepository.java

@@ -1,7 +1,7 @@
-package com.dduckddak.domain.data.repository;
+package com.dduckddak.domain.data.population.repository;
 
-import com.dduckddak.domain.data.model.Population;
-import com.dduckddak.domain.data.model.PopulationType;
+import com.dduckddak.domain.data.population.model.Population;
+import com.dduckddak.domain.data.population.model.PopulationType;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.jdbc.core.JdbcTemplate;

src/main/java/com/dduckddak/domain/data/population/repository/PopulationRepository.java

@@ -0,0 +1,16 @@
+package com.dduckddak.domain.data.population.repository;
+
+import com.dduckddak.domain.data.population.model.Population;
+import com.dduckddak.domain.data.population.model.PopulationType;
+import com.dduckddak.domain.town.model.Town;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface PopulationRepository extends JpaRepository<Population, Long>, PopulationRepositoryCustom {
+
+    Population findByTownAndPopulationType(Town town, PopulationType populationType);
+
+
+
+
+
+}