Merge pull request #90 from Maum-eum/fix/#89

fix: 주소 Entity 테이블명 수정 및 목데이터 생성범위 수정

Author: GEISHAz

src/main/java/com/example/springserver/MockDataGenerator.java

@@ -1,18 +1,38 @@
 package com.example.springserver;
 
+import com.example.springserver.domain.caregiver.entity.*;
+import com.example.springserver.domain.caregiver.entity.enums.CertType;
+import com.example.springserver.domain.caregiver.entity.enums.Level;
+import com.example.springserver.domain.caregiver.entity.enums.ScheduleAvailability;
+import com.example.springserver.domain.caregiver.repository.*;
+import com.example.springserver.domain.center.entity.*;
+import com.example.springserver.domain.center.entity.enums.CareType;
+import com.example.springserver.domain.center.entity.enums.ElderRate;
+import com.example.springserver.domain.center.entity.enums.Inmate;
+import com.example.springserver.domain.center.entity.enums.Week;
+import com.example.springserver.domain.center.repository.*;
+import com.example.springserver.domain.location.entity.Location;
+import com.example.springserver.repository.location.LocationRepository;
+import net.datafaker.Faker;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.IntStream;
+
 @Transactional
 @Component
 public class MockDataGenerator implements ApplicationRunner {
-//
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
 //        System.out.println("Mock 데이터 생성 메서드 실행...");
 //        createMockData();
+//        System.out.println("Mock 데이터 생성 메서드 끝...");
     }
 //
 //    /* 애플리케이션 실행 시점에 Mock 데이터 생성 */
@@ -52,7 +72,7 @@ public void run(ApplicationArguments args) throws Exception {
 //        }
 //
 //        // 3. 요양보호사 데이터 생성
-//        for (int i = 0; i < 50; i++) { // 요양보호사 60건
+//        for (int i = 0; i < 1500; i++) { // 요양보호사 60건
 //            careGiver();
 //        }
 //
@@ -63,7 +83,7 @@ public void run(ApplicationArguments args) throws Exception {
 //        }
 //
 //        // 5. 구직 조건, 근무지 데이터 생성
-//        for (int i = 0; i < 50; i++) { // 구직 조건 50건
+//        for (int i = 0; i < 1500; i++) { // 구직 조건 50건
 //            jobCondition(i+1);
 //            workLocation();
 //        }
@@ -138,7 +158,7 @@ public void run(ApplicationArguments args) throws Exception {
 //    void recruitCondition(int i) {
 //        Elder elder = elderRepository.findById(Long.valueOf(i))
 //                .orElseThrow(() -> new RuntimeException("===== elder 중복 ====="));
-//        Location recruitLocation = locationRepository.findByLocationId(faker.random().nextLong(1000, 3000));
+//        Location recruitLocation = locationRepository.findByLocationId(faker.random().nextLong(1,50));
 //        List<CareType> careTypes = Collections.singletonList(faker.options().option(CareType.class));
 //        boolean flexibleSchedule = faker.bool().bool(); // 시간 협의 여부
 //        List<RecruitTime> recruitTimes = new ArrayList<>();
@@ -179,7 +199,7 @@ public void run(ApplicationArguments args) throws Exception {
 //        Elder elder = elderRepository.findById(Long.valueOf(i))
 //                .orElseThrow(() -> new RuntimeException("===== elder 중복 ====="));
 //        List<CareType> careTypes = Collections.singletonList(faker.options().option(CareType.class));
-//        Location careLocation = locationRepository.findByLocationId(faker.random().nextLong(1000, 3000));
+//        Location careLocation = locationRepository.findByLocationId(faker.random().nextLong(1,1000));
 //        boolean flexibleSchedule = faker.bool().bool(); // 시간 협의 여부
 //        boolean mealAssistance = faker.bool().bool();
 //        boolean toiletAssistance = faker.bool().bool();
@@ -278,7 +298,7 @@ public void run(ApplicationArguments args) throws Exception {
 //    }
 //
 //    void workLocation() {
-//        Location locationId = locationRepository.findByLocationId((long) faker.number().numberBetween(1000, 3000));
+//        Location locationId = locationRepository.findByLocationId((long) faker.number().numberBetween(1, 10));
 //        JobCondition jobCondition = jobConditionRepository.findRandom().get();
 //
 //        WorkLocation workLocation = new WorkLocation(locationId, jobCondition);

src/main/java/com/example/springserver/domain/center/repository/MatchRepository.java

@@ -24,7 +24,7 @@ List<Match> findAllByJobConditionWithStatus(
             @Param("statuses") List<MatchStatus> statuses
     );
 
-    @Query(value = "SELECT match.status FROM match " +
+    @Query(value = "SELECT `match`.status FROM `match` " +
             "WHERE requirement_condition_id = :rc " +
             "AND job_condition_id = :jc " +
             "AND `match`.status IN ('WAITING', 'TUNING')" +

src/main/java/com/example/springserver/domain/location/entity/Location.java

@@ -8,6 +8,7 @@
 @Getter
 @Setter
 @Entity
+@Table(name = "location")
 public class Location {
 
     @Id

src/main/java/com/example/springserver/domain/location/entity/Sido.java

@@ -12,6 +12,7 @@
 @Getter
 @Setter
 @Entity
+@Table(name = "sido")
 public class Sido {
 
     @Id

src/main/java/com/example/springserver/domain/location/entity/Sigungu.java

@@ -12,6 +12,7 @@
 @Getter
 @Setter
 @Entity
+@Table(name="sigungu")
 public class Sigungu {
 
     @Id

src/main/resources/data.sql

@@ -1,4 +1,4 @@
-INSERT INTO Sido (sido_name) VALUES
+INSERT INTO sido (sido_name) VALUES
 ('강원특별자치도'),
 ('경기도'),
 ('경상남도'),
@@ -18,7 +18,7 @@ INSERT INTO Sido (sido_name) VALUES
 ('충청북도');
 
 
-INSERT INTO Sigungu (sido_id, sigungu_name)
+INSERT INTO sigungu (sido_id, sigungu_name)
 SELECT s.sido_id, v.sigungu_name
 FROM (
     SELECT '강릉시', '강원특별자치도' UNION ALL
@@ -274,10 +274,10 @@ FROM (
     SELECT '청주시흥덕구', '충청북도' UNION ALL
     SELECT '충주시', '충청북도'
 ) AS v(sigungu_name, sido_name)
-JOIN Sido s ON s.sido_name = v.sido_name;
+JOIN sido s ON s.sido_name = v.sido_name;
 
 
-INSERT INTO Location (sigungu_id, dong_name, sido_name, sigungu_name)
+INSERT INTO location (sigungu_id, dong_name, sido_name, sigungu_name)
 SELECT sg.sigungu_id, v.dong_name, v.sido_name, v.sigungu_name
 FROM (
     SELECT '강동면', '강원특별자치도', '강릉시' UNION ALL
@@ -5349,5 +5349,5 @@ FROM (
     SELECT '풍동', '충청북도', '충주시' UNION ALL
     SELECT '호암동', '충청북도', '충주시'
 ) AS v(dong_name, sido_name, sigungu_name)
-JOIN Sigungu sg ON sg.sigungu_name = v.sigungu_name
-JOIN Sido s ON s.sido_name = v.sido_name AND sg.sido_id = s.sido_id;
+JOIN sigungu sg ON sg.sigungu_name = v.sigungu_name
+JOIN sido s ON s.sido_name = v.sido_name AND sg.sido_id = s.sido_id;