diff --git a/.gitignore b/.gitignore index 4fefe03..be25730 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,6 @@ out/ src/main/resources/firebase/ #/src/main/java/com/campick/server/common/config/DataInitializer.java -*/.DS_Store \ No newline at end of file +*/.DS_Store + +**/resources/** \ No newline at end of file diff --git a/src/main/java/com/campick/server/api/member/service/MemberService.java b/src/main/java/com/campick/server/api/member/service/MemberService.java index 6666d37..4751e9e 100644 --- a/src/main/java/com/campick/server/api/member/service/MemberService.java +++ b/src/main/java/com/campick/server/api/member/service/MemberService.java @@ -139,10 +139,16 @@ public void logout(String accessToken) { @Transactional public void deleteMember(Long memberId) { + // 멤버 지우기 Member member = memberRepository.findByIdAndIsDeletedFalse(memberId) .orElseThrow(() -> new NotFoundException(ErrorStatus.MEMBER_NOT_FOUND.getMessage())); member.delete(); memberRepository.save(member); + + // product is_deleted를 true로 + List productsToDelete = productRepository.findProductsBySeller(member); + productsToDelete.forEach(product -> product.setIsDeleted(true)); + productRepository.saveAll(productsToDelete); } public boolean isEmailDuplicate(String email) { diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties deleted file mode 100644 index 4b65168..0000000 --- a/src/main/resources/application-local.properties +++ /dev/null @@ -1,52 +0,0 @@ -spring.application.name=campick-server -#spring.datasource.url=jdbc:mysql://localhost:3306/mydatabase?useSSL=false&serverTimezone=UTC&characterEncoding=UTF-8 -#spring.datasource.username=root -#spring.datasource.password= -#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - -spring.datasource.url=jdbc:h2:mem:testdb -spring.datasource.driver-class-name=org.h2.Driver -spring.datasource.username=sa -spring.datasource.password= -spring.h2.console.enabled=true -spring.h2.console.path=/h2-console - -spring.jpa.hibernate.ddl-auto=create -spring.jpa.defer-datasource-initialization=true -spring.jpa.show-sql=true -#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect -spring.jpa.properties.hibernate.format_sql=true -logging.level.org.hibernate.SQL=DEBUG - - -spring.mail.host=smtp.gmail.com -spring.mail.port=587 -spring.mail.username=tjrthrns0146@gmail.com -spring.mail.password=uftm qyly lhaf snaa -spring.mail.properties.mail.smtp.auth=true -spring.mail.properties.mail.smtp.starttls.enable=true -spring.mail.default-encoding=UTF-8 - - -jwt.secret=23047230439274020942309320a09ds98asd90f8asd08f9asd08f0sad890f7asd0fsd7gads0g790sd -jwt.access.header=AccessToken -jwt.refresh.header=RefreshToken - - -firebase.credentials.path=classpath:firebase/firebaseAccountKey.json -firebase.storage.bucket=campick-6072a.firebasestorage.app - -spring.servlet.multipart.max-file-size=10MB -spring.servlet.multipart.max-request-size=200MB - -server.ssl.enabled=false -server.port=8080 - -spring.data.redis.host=localhost -spring.data.redis.port=6379 - -############################## -###### Swagger Setting ####### -############################## -serverUrl = http://localhost:8080 \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 3a8825d..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,70 +0,0 @@ -#* To get setting local properties -#! TODO When Start Deploy must caption below -#spring.profiles.active=local - - -############################## -###### Database Setting ###### -############################## -spring.application.name=campick-server -spring.datasource.url=${SPRING_DATASOURCE_URL} -spring.datasource.username=${SPRING_DATASOURCE_USERNAME} -spring.datasource.password=${SPRING_DATASOURCE_PASSWORD} -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - -#! TODO When Start Deploy must change this option 'create' to 'update' -spring.jpa.hibernate.ddl-auto=create -spring.jpa.defer-datasource-initialization=true -#spring.sql.init.mode=always -spring.jpa.show-sql=true -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect -spring.jpa.properties.hibernate.format_sql=true -logging.level.org.hibernate.SQL=DEBUG - - -############################## -######## smtp Setting ######## -############################## -spring.mail.host=smtp.gmail.com -spring.mail.port=587 -spring.mail.username=tjrthrns0146@gmail.com -spring.mail.password=uftm qyly lhaf snaa -spring.mail.properties.mail.smtp.auth=true -spring.mail.properties.mail.smtp.starttls.enable=true -spring.mail.default-encoding=UTF-8 - -############################## -###### tls/ssl Setting ####### -############################## -server.ssl.enabled=true -server.ssl.key-store=${SSL_KEY_PATH} -server.ssl.key-store-password=${SSL_KEY_PASSWORD} -server.ssl.key-store-type=PKCS12 -server.port=443 - -############################## -######## jwt Setting ######### -############################## -jwt.secret=23047230439274020942309320a09ds98asd90f8asd08f9asd08f0sad890f7asd0fsd7gads0g790sd -jwt.access.header=AccessToken -jwt.refresh.header=RefreshToken - - -############################## -###### firebase Setting ###### -############################## -firebase.credentials.path=classpath:firebase/firebaseAccountKey.json -firebase.storage.bucket=campick-6072a.firebasestorage.app - -############################## -###### redis Setting ###### -############################## -spring.data.redis.host=localhost -spring.data.redis.port=6379 -spring.data.redis.repositories.enabled=false - - -############################## -###### Swagger Setting ###### -############################## -serverUrl = https://campick.shop \ No newline at end of file diff --git a/src/main/resources/campick.p12 b/src/main/resources/campick.p12 deleted file mode 100644 index 3aefe70..0000000 Binary files a/src/main/resources/campick.p12 and /dev/null differ diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql deleted file mode 100644 index c9dcab4..0000000 --- a/src/main/resources/data.sql +++ /dev/null @@ -1,44 +0,0 @@ --- Vehicle Types -INSERT INTO `type` (type_name) VALUES ('MOTOR_HOME'); -INSERT INTO `type` (type_name) VALUES ('CARAVAN'); -INSERT INTO `type` (type_name) VALUES ('TRAILER'); -INSERT INTO `type` (type_name) VALUES ('TRUCK_CAMPER'); -INSERT INTO `type` (type_name) VALUES ('ETC'); - --- Models --- MOTOR_HOME -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'MOTOR_HOME'), '1톤축연장'); -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'MOTOR_HOME'), '1톤축미연장'); -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'MOTOR_HOME'), '칸'); -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'MOTOR_HOME'), '마스터'); -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'MOTOR_HOME'), '스타렉스'); -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'MOTOR_HOME'), '스타리아'); -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'MOTOR_HOME'), '카운티'); - --- CARAVAN -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'CARAVAN'), '300급'); -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'CARAVAN'), '400급'); -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'CARAVAN'), '500급'); -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'CARAVAN'), '600급'); - --- TRAILER -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'TRAILER'), '폴딩형'); -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'TRAILER'), '카고형'); - --- TRUCK_CAMPER -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'TRUCK_CAMPER'), '그외'); - --- ETC -INSERT INTO model (type_id, model_name) VALUES ((SELECT type_id FROM `type` WHERE type_name = 'ETC'), '기타'); - --- Engines -INSERT INTO `engine` (feul_type, transmission, horse_power, fuel_efficiency) VALUES ('GASOLINE', 'MANUAL', 150, 10.0); -INSERT INTO `engine` (feul_type, transmission, horse_power, fuel_efficiency) VALUES ('GASOLINE', 'AUTOMATIC', 150, 10.0); -INSERT INTO `engine` (feul_type, transmission, horse_power, fuel_efficiency) VALUES ('DIESEL', 'MANUAL', 180, 12.5); -INSERT INTO `engine` (feul_type, transmission, horse_power, fuel_efficiency) VALUES ('DIESEL', 'AUTOMATIC', 180, 12.5); -INSERT INTO `engine` (feul_type, transmission, horse_power, fuel_efficiency) VALUES ('ELECTRIC', 'AUTOMATIC', 200, 0); -INSERT INTO `engine` (feul_type, transmission, horse_power, fuel_efficiency) VALUES ('HYBRID', 'AUTOMATIC', 190, 15.0); - - --- Cars -INSERT INTO `car` (model_id, engine_id) SELECT m.model_id, e.engine_id FROM model m, engine e;