Skip to content

Commit

Permalink
Merge pull request #63 from cgk95/feat/#41
Browse files Browse the repository at this point in the history 
브랜드 목록에서 각 브랜드의 제품을 읽어오는 배치 작업 추가
  • Loading branch information
@chan99k
chan99k authored Jan 19, 2024
2 parents c7c02a5 + aa17736 commit a387b5e
Show file tree
Hide file tree
Showing 33 changed files with 1,069 additions and 161 deletions.
17 changes: 2 additions & 15 deletions module-api/src/main/java/com/kernel360/product/dto/ProductDto.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.kernel360.product.dto;

import com.kernel360.product.entity.Product;

import java.time.LocalDate;

/**
* DTO for {@link com.kernel360.product.entity.Product}
*/

// FIXME :: Product 테이블 변경에 따라서 toEntity 또한 변경되어야 함.
public record ProductDto(Long productNo,
String productName,
String barcode,
Expand Down Expand Up @@ -55,7 +54,7 @@ public static ProductDto from(Product entity) {
entity.getProductName(),
entity.getBarcode(),
entity.getDescription(),
entity.getDeclareNo(),
entity.getReportNumber(),
entity.getIsViolation(),
entity.getViewCount(),
entity.getCreatedAt(),
Expand All @@ -64,16 +63,4 @@ public static ProductDto from(Product entity) {
entity.getModifiedBy()
);
}

public static Product toEntity(ProductDto productDto) {
return Product.of(
productDto.productName,
productDto.barcode,
productDto.description,
productDto.declareNo,
productDto.isViolation,
productDto.viewCount
);
}

}
4 changes: 4 additions & 0 deletions module-api/src/main/resources/db/migration/V1.1.0__alter_reported_product_column_type.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ALTER TABLE reported_product
ALTER COLUMN stddusqy TYPE TEXT USING stddusqy::TEXT,
ALTER COLUMN safe_sd TYPE TEXT USING safe_sd::TEXT,
ALTER COLUMN propos TYPE TEXT USING propos::TEXT;
104 changes: 104 additions & 0 deletions module-api/src/main/resources/db/migration/V1.1.1__alter_brand_and_product_table.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
-- Brand 에 company_name 컬럼 추가
drop table if exists product;
drop TABLE if exists Brand;

CREATE TABLE if not exists Brand
(
brand_no BIGSERIAL PRIMARY KEY,
brand_name VARCHAR NOT NULL,
company_name VARCHAR NOT NULL,
description VARCHAR,
nation_name VARCHAR,
created_at DATE NOT NULL,
created_by VARCHAR NOT NULL,
modified_at DATE,
modified_by VARCHAR
);


Insert Into brand (brand_no, brand_name, company_name, nation_name, created_at, created_by)
VALUES (1, '더클래스', '코스메디슨(CosMedicine)', '대한민국', current_date, 'admin'),
(1601, '더클래스', '더클래스', '대한민국', current_date, 'admin'),
(51, '크리스탈 코트', '(주) 불스원', '대한민국', current_date, 'admin'),
(101, '불스원', '(주) 불스원', '대한민국', current_date, 'admin'),
(151, '글로스브로', '주식회사 제이씨웍스', '대한민국', current_date, 'admin'),
(201, '파이어볼', '(주)파이어볼', '대한민국', current_date, 'admin'),
(251, '티에이씨시스템', '티에이씨시스템', '대한민국', current_date, 'admin'),
(301, '기온테크놀로지', '주식회사 기온테크놀로지(Gyeon Technology)', '대한민국', current_date, 'admin'),
(351, '루나틱폴리시', '(주) 불스원', '대한민국', current_date, 'admin'),
(401, '젠틀맨', '주식회사 에스피', '대한민국', current_date, 'admin'),
(451, '디아만테', '현일', '대한민국', current_date, 'admin'),
(501, '(주)오토왁스', '(주)오토왁스', '대한민국', current_date, 'admin'),

(551, '라보코스메디카', '주식회사 대흥아이앤씨(INC)', '이탈리아', current_date, 'admin'),
(601, '마프라', '주식회사 대흥아이앤씨(INC)', '이탈리아', current_date, 'admin'),
(651, '매니악', '주식회사 대흥아이앤씨(INC)', '이탈리아', current_date, 'admin'),
(701, 'EXQ', '이엑스큐(EXQ)', '대한민국', current_date, 'admin'),
-- (751, 'EXQ', '이엑스큐(EXQ)', '중국', current_date, 'admin'),

(801, '터틀왁스', '(주)에스씨에이', '미국', current_date, 'admin'),
(851, '잭스왁스', '주식회사 잭스왁스코리아', '미국', current_date, 'admin'),
(901, '오토브라이트', '주식회사 오토브라이트다이렉트코리아(AUTOBRITE DIRECT KOREA CO.,LTD)', '영국', current_date, 'admin'),

(951, '블루믹스', '제이웍스 (J-works)', '대한민국', current_date, 'admin'),
(1001, '림피오', '림피오(LIMPIO)', '대한민국', current_date, 'admin'),
(1051, '좀비', '한국씨앤에스', '대한민국', current_date, 'admin'),
(1101, '카프로', '(주)카프로코리아', '대한민국', current_date, 'admin'),

(1151, '이지카케어', '발스코리아(주)', '영국', current_date, 'admin'),
(1201, '니그린', '(주)다스모터스', '영국', current_date, 'admin'),
(1251, '도도쥬스', '주식회사투왁스', '영국', current_date, 'admin'),
(1301, '루미너스', '주식회사 엘엠', '대한민국', current_date, 'admin'),


(1351, '소낙스', '(주)알레스', '독일', current_date, 'admin'),
(1401, '스마트왁스', '에이큐에이 주식회사', '미국', current_date, 'admin'),
(1451, '케미컬가이', '에이큐에이 주식회사', '미국', current_date, 'admin'),
(1501, '리바이브', '주식회사 에스피', '영국', current_date, 'admin'),
(1551, '보닉스', '대흥아이앤씨', '브라질', current_date, 'admin'),
(1651, '루미너스', '루미너스코리아', '대한민국', current_date, 'admin');


CREATE SEQUENCE IF NOT EXISTS product_product_no_seq START WITH 1 INCREMENT BY 50;

CREATE TABLE product
(
product_no BIGSERIAL NOT NULL,
created_at date NOT NULL,
created_by VARCHAR(255) NOT NULL,
modified_at date,
modified_by VARCHAR(255),
product_name VARCHAR(255) NOT NULL,
barcode VARCHAR(255),
description TEXT,
company_name VARCHAR(255),
report_no VARCHAR(255),
product_type VARCHAR(255),
safety_inspection_standard VARCHAR(255),
upper_item VARCHAR(255),
item VARCHAR(255),
propose TEXT,
weight VARCHAR(255),
usage TEXT,
usage_precaution TEXT,
first_aid TEXT,
main_substance TEXT,
allergic_substance TEXT,
other_substance TEXT,
preservative TEXT,
surfactant TEXT,
fluorescent_whitening TEXT,
manufacture_type VARCHAR(255),
manufacture_method VARCHAR(255),
manufacture_country VARCHAR(255),
is_violation BOOLEAN NOT NULL,
view_count INTEGER NOT NULL,
brand_no BIGSERIAL,
CONSTRAINT pk_product PRIMARY KEY (product_no)
);

ALTER TABLE product
ADD CONSTRAINT FK_PRODUCT_ON_BRAND_NO FOREIGN KEY (brand_no) REFERENCES brand (brand_no);

alter sequence product_product_no_seq increment by 50;
alter sequence brand_brand_no_seq increment by 50;
19 changes: 15 additions & 4 deletions module-batch/src/main/java/com/kernel360/modulebatch/ModuleBatchApplication.java
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,32 @@
package com.kernel360.modulebatch;

import java.util.Optional;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Bean;
import org.springframework.data.domain.AuditorAware;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.scheduling.annotation.EnableScheduling;

@EnableBatchProcessing
@EnableScheduling
@EntityScan("com.kernel360.ecolife.entity")
@EnableJpaRepositories("com.kernel360.ecolife.repository")
@SpringBootApplication(scanBasePackages = {"com.kernel360"})
@EnableJpaAuditing
@EnableBatchProcessing
@SpringBootApplication
@EnableJpaRepositories({"com.kernel360.ecolife.repository", "com.kernel360.product.repository",
"com.kernel360.brand.repository"})
@EntityScan({"com.kernel360.ecolife.entity", "com.kernel360.product.entity", "com.kernel360.brand.entity"})
public class ModuleBatchApplication {

public static void main(String[] args) {
SpringApplication.run(ModuleBatchApplication.class, args);
}

@Bean
public AuditorAware<String> auditorProvider() {
return () -> Optional.of("admin-batch");
}

}
53 changes: 53 additions & 0 deletions module-batch/src/main/java/com/kernel360/modulebatch/product/dto/ProductDto.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package com.kernel360.modulebatch.product.dto;

import com.kernel360.brand.entity.Brand;
import com.kernel360.product.entity.Product;

public record ProductDto(String productName, String barcode, String description,
Boolean isViolation, Integer viewCount,
String companyName, String reportNumber,
String productType, String safetyInspectionStandard,
String upperItem, String item,
String propose, String weight, String usage, String usagePrecaution, String firstAid,
String mainSubstance, String allergicSubstance, String otherSubstance, String preservative,
String Surfactant, String fluorescentWhitening, String manufactureType,
String manufactureMethod, String manufactureCountry,
Brand brand) {

public static ProductDto of(String productName, String barcode, String description,
Boolean isViolation, Integer viewCount,
String companyName, String reportNumber,
String productType, String safetyInspectionStandard,
String upperItem, String item,
String propose, String weight, String usage, String usagePrecaution, String firstAid,
String mainSubstance, String allergicSubstance, String otherSubstance,
String preservative,
String Surfactant, String fluorescentWhitening, String manufactureType,
String manufactureMethod, String manufactureCountry,
Brand brand) {
return new ProductDto(
productName, barcode, description,
isViolation, viewCount,
companyName, reportNumber,
productType, safetyInspectionStandard,
upperItem, item,
propose, weight, usage, usagePrecaution, firstAid,
mainSubstance, allergicSubstance, otherSubstance, preservative,
Surfactant, fluorescentWhitening, manufactureType,
manufactureMethod, manufactureCountry,
brand
);
}

public static Product toEntity(ProductDto productDto) {
return Product.of(productDto.productName, productDto.barcode(), productDto.description(),
productDto.reportNumber(), productDto.isViolation, productDto.viewCount, productDto.companyName(),
productDto.productType(), productDto.safetyInspectionStandard, productDto.upperItem(),
productDto.item(),
productDto.propose(), productDto.weight(), productDto.usage(), productDto.usagePrecaution(),
productDto.firstAid(), productDto.mainSubstance(), productDto.allergicSubstance(),
productDto.otherSubstance(), productDto.preservative(), productDto.Surfactant(),
productDto.fluorescentWhitening(), productDto.manufactureType(), productDto.manufactureMethod(),
productDto.manufactureCountry(), productDto.brand());
}
}
Loading

0 comments on commit a387b5e

Please sign in to comment.