officer/egovframe-msa-edu
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
jooho
2021-10-29 15:39:42 +09:00
parent 2417b14b0b 767b8eacdc
commit ebd3e4fc3c
17 changed files with 266 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
.gitignore vendored
View File

@@ -43,3 +43,35 @@ HELP.md
*.DS_Store
*.AppleDouble
*.LSOverride
# dependencies
**/node_modules
**/.pnp
**/.pnp.js
# testing
**/coverage
# next.js
**/.next/
**/out/
# production
**/build
**/dist
# misc
**.DS_Store
*.pem
# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# local env files
**/.env.local
**/.env.development.local
**/.env.test.local
**/.env.production.local

4
backend/config/src/main/resources/logback-spring.xml
View File

@@ -8,12 +8,12 @@
</appender>
<!-- 로컬에서는 로그를 전송하지 않도록 설정 -->
<springProfile name="native">
<springProfile name="default">
<root level="INFO">
<appender-ref ref="STDOUT" />
</root>
</springProfile>
<springProfile name="!native">
<springProfile name="!default">
<!-- java -Dlogstash_hostname="localhost:5001" 와 같이 변경할 수 있다. cf 환경에서는 manifest.yml 파일에 환경변수로 추가 -->
<property name="destination" value="${logstash_hostname:-localhost:5001}" />
<property name="app_name" value="${app_name:-config-server}" />

6
backend/reserve-check-service/build.gradle
View File

@@ -44,7 +44,7 @@ dependencies {
//messaging
implementation 'org.springframework.cloud:spring-cloud-stream'
implementation 'org.springframework.cloud:spring-cloud-stream-binder-rabbit'
implementation 'net.java.dev.jna:jna:5.9.0' // byte-buddy (No compatible attachment provider is available.)
// implementation 'net.java.dev.jna:jna:5.9.0' // byte-buddy (No compatible attachment provider is available.)
implementation 'io.jsonwebtoken:jjwt:0.9.1'
@@ -55,8 +55,8 @@ dependencies {
implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.5.10'
// bolcking 호출 감지
implementation 'io.projectreactor:reactor-tools:3.4.9'
implementation 'io.projectreactor.tools:blockhound:1.0.6.RELEASE'
// implementation 'io.projectreactor:reactor-tools:3.4.9'
// implementation 'io.projectreactor.tools:blockhound:1.0.6.RELEASE'
//lombok
implementation 'org.projectlombok:lombok'

2
backend/reserve-check-service/src/main/java/org/egovframe/cloud/reservechecksevice/client/dto/UserResponseDto.java
View File

@@ -2,6 +2,7 @@ package org.egovframe.cloud.reservechecksevice.client.dto;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
/**
* org.egovframe.cloud.userservice.api.user.dto.UserResponseDto
@@ -21,6 +22,7 @@ import lombok.Getter;
* </pre>
*/
@Getter
@NoArgsConstructor
public class UserResponseDto {
private String userId;

6
backend/reserve-item-service/build.gradle
View File

@@ -50,13 +50,13 @@ dependencies {
implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.5.10'
// bolcking 호출 감지
implementation 'io.projectreactor:reactor-tools:3.4.9'
implementation 'io.projectreactor.tools:blockhound:1.0.6.RELEASE'
// implementation 'io.projectreactor:reactor-tools:3.4.9'
// implementation 'io.projectreactor.tools:blockhound:1.0.6.RELEASE'
//messaging
implementation 'org.springframework.cloud:spring-cloud-stream'
implementation 'org.springframework.cloud:spring-cloud-stream-binder-rabbit'
implementation 'net.java.dev.jna:jna:5.9.0' // byte-buddy (No compatible attachment provider is available.)
// implementation 'net.java.dev.jna:jna:5.9.0' // byte-buddy (No compatible attachment provider is available.)
//lombok
implementation 'org.projectlombok:lombok'

6
backend/reserve-request-service/build.gradle
View File

@@ -46,7 +46,7 @@ dependencies {
implementation 'org.springframework.cloud:spring-cloud-stream'
implementation 'org.springframework.cloud:spring-cloud-stream-binder-rabbit'
implementation 'org.springframework.boot:spring-boot-starter-amqp'
implementation 'net.java.dev.jna:jna:5.9.0' // byte-buddy (No compatible attachment provider is available.)
// implementation 'net.java.dev.jna:jna:5.9.0' // byte-buddy (No compatible attachment provider is available.)
implementation 'io.jsonwebtoken:jjwt:0.9.1'
@@ -58,8 +58,8 @@ dependencies {
implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.5.10'
// bolcking 호출 감지
implementation 'io.projectreactor:reactor-tools:3.4.9'
implementation 'io.projectreactor.tools:blockhound:1.0.6.RELEASE'
// implementation 'io.projectreactor:reactor-tools:3.4.9'
// implementation 'io.projectreactor.tools:blockhound:1.0.6.RELEASE'
//lombok
implementation 'org.projectlombok:lombok'

85
backend/reserve-request-service/src/test/java/org/egovframe/cloud/reserverequestservice/api/ReserveApiControllerTest.java Normal file
View File

@@ -0,0 +1,85 @@
package org.egovframe.cloud.reserverequestservice.api;
import static org.assertj.core.api.Assertions.*;
import java.time.LocalDateTime;
import org.egovframe.cloud.common.domain.Role;
import org.egovframe.cloud.reserverequestservice.api.dto.ReserveResponseDto;
import org.egovframe.cloud.reserverequestservice.api.dto.ReserveSaveRequestDto;
import org.egovframe.cloud.reserverequestservice.config.WithCustomMockUser;
import org.egovframe.cloud.reserverequestservice.domain.Reserve;
import org.egovframe.cloud.reserverequestservice.domain.ReserveRepository;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.web.reactive.server.WebTestClient;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@EnableConfigurationProperties
@TestPropertySource(properties = {"spring.config.location=classpath:application-test.yml"})
@ActiveProfiles(profiles = "test")
class ReserveApiControllerTest {
@Autowired
private ReserveRepository reserveRepository;
@Autowired
private WebTestClient webTestClient;
private Reserve reserve;
@BeforeEach
public void setup() {
reserve = Reserve.builder()
.reserveId("1")
.reserveQty(50)
.reservePurposeContent("test")
.reserveStatusId("request")
.reserveStartDate(LocalDateTime.of(2021, 9, 9, 1, 1))
.reserveEndDate(LocalDateTime.of(2021, 9, 20, 1, 1))
.build();
}
@AfterEach
public void tearDown() {
reserveRepository.deleteAll().block();
}
@Test
@WithCustomMockUser(userId = "user", role = Role.USER)
public void 사용자_예약_성공() throws Exception {
ReserveSaveRequestDto saveRequestDto =
ReserveSaveRequestDto.builder()
.reserveItemId(reserve.getReserveItemId())
.reservePurposeContent(reserve.getReservePurposeContent())
.reserveQty(reserve.getReserveQty())
.reserveStartDate(reserve.getReserveStartDate())
.reserveEndDate(reserve.getReserveEndDate())
.attachmentCode(reserve.getAttachmentCode())
.userId(reserve.getUserId())
.userContactNo(reserve.getUserContactNo())
.userEmail(reserve.getUserEmail())
.build();
ReserveResponseDto responseBody = webTestClient.post()
.uri("/api/v1/requests/evaluates")
.bodyValue(saveRequestDto)
.exchange()
.expectStatus().isCreated()
.expectBody(ReserveResponseDto.class)
.returnResult().getResponseBody();
assertThat(responseBody.getReserveQty()).isEqualTo(reserve.getReserveQty());
assertThat(responseBody.getReservePurposeContent()).isEqualTo(reserve.getReservePurposeContent());
}
}

40
backend/reserve-request-service/src/test/java/org/egovframe/cloud/reserverequestservice/config/R2dbcConfig.java Normal file
View File

@@ -0,0 +1,40 @@
package org.egovframe.cloud.reserverequestservice.config;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Profile;
import org.springframework.core.io.ClassPathResource;
import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
import org.springframework.r2dbc.connection.init.CompositeDatabasePopulator;
import org.springframework.r2dbc.connection.init.ConnectionFactoryInitializer;
import org.springframework.r2dbc.connection.init.ResourceDatabasePopulator;
import io.r2dbc.h2.H2ConnectionConfiguration;
import io.r2dbc.h2.H2ConnectionFactory;
import io.r2dbc.h2.H2ConnectionOption;
import io.r2dbc.spi.ConnectionFactory;
@Profile("test")
@TestConfiguration
@EnableR2dbcRepositories
public class R2dbcConfig {
@Bean
public H2ConnectionFactory connectionFactory() {
return new H2ConnectionFactory(H2ConnectionConfiguration.builder()
.inMemory("testdb")
.property(H2ConnectionOption.DB_CLOSE_DELAY, "-1")
.username("sa")
.build());
}
@Bean
public ConnectionFactoryInitializer initializer(ConnectionFactory connectionFactory) {
ConnectionFactoryInitializer initializer = new ConnectionFactoryInitializer();
initializer.setConnectionFactory(connectionFactory);
CompositeDatabasePopulator populator = new CompositeDatabasePopulator();
populator.addPopulators(new ResourceDatabasePopulator(new ClassPathResource("schema-h2.sql")));
initializer.setDatabasePopulator(populator);
return initializer;
}
}

16
backend/reserve-request-service/src/test/java/org/egovframe/cloud/reserverequestservice/config/WithCustomMockUser.java Normal file
View File

@@ -0,0 +1,16 @@
package org.egovframe.cloud.reserverequestservice.config;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import org.egovframe.cloud.common.domain.Role;
import org.springframework.security.test.context.support.WithSecurityContext;
@Retention(RetentionPolicy.RUNTIME)
@WithSecurityContext(factory = WithMockCustomUserSecurityContextFactory.class)
public @interface WithCustomMockUser {
String userId() default "user";
Role role() default Role.ADMIN;
}

25
backend/reserve-request-service/src/test/java/org/egovframe/cloud/reserverequestservice/config/WithMockCustomUserSecurityContextFactory.java Normal file
View File

@@ -0,0 +1,25 @@
package org.egovframe.cloud.reserverequestservice.config;
import java.util.ArrayList;
import java.util.List;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.test.context.support.WithSecurityContextFactory;
public class WithMockCustomUserSecurityContextFactory implements WithSecurityContextFactory<WithCustomMockUser> {
@Override
public SecurityContext createSecurityContext(WithCustomMockUser mockUser) {
SecurityContext context = SecurityContextHolder.createEmptyContext();
List<SimpleGrantedAuthority> roleList = new ArrayList<>();
roleList.add(new SimpleGrantedAuthority(mockUser.role().getKey()));
UsernamePasswordAuthenticationToken authenticationToken =
new UsernamePasswordAuthenticationToken(mockUser.userId(), null, roleList);
context.setAuthentication(authenticationToken);
return context;
}
}

16
backend/reserve-request-service/src/test/resources/application-test.yml
View File

@@ -1,21 +1,7 @@
spring:
application:
name: reserve-request-service
name: reserve-check-service
datasource:
url: jdbc:h2:mem:testdb;MODE=MYSQL;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false
username: sa
password:
driver-class-name: org.h2.Driver
jpa:
hibernate:
generate-ddl: true
ddl-auto: create-drop
properties:
hibernate:
format_sql: true
default_batch_fetch_size: 1000
show-sql: true
h2:
console:
enabled: true

5
backend/reserve-request-service/src/test/resources/bootstrap.yml Normal file
View File

@@ -0,0 +1,5 @@
spring:
cloud:
config:
uri: http://localhost:8888
name: reserve-request-service

23
backend/reserve-request-service/src/test/resources/schema-h2.sql Normal file
View File

@@ -0,0 +1,23 @@
-- reserve Table Create SQL
CREATE TABLE IF NOT EXISTS reserve
(
reserve_id VARCHAR(255) NOT NULL COMMENT '예약 id',
reserve_item_id BIGINT NULL COMMENT '예약 물품 id',
location_id BIGINT NULL COMMENT '예약 물품-지역 id',
category_id VARCHAR(255) NULL COMMENT '예약 물품-유형 id',
reserve_qty BIGINT(18) NULL COMMENT '예약 신청인원/수량',
reserve_purpose_content VARCHAR(4000) NULL COMMENT '예약신청 목적',
attachment_code VARCHAR(255) NULL COMMENT '첨부파일 코드',
reserve_start_date DATETIME NULL COMMENT '예약 신청 시작일',
reserve_end_date DATETIME NULL COMMENT '예약 신청 종료일',
reserve_status_id VARCHAR(20) NULL COMMENT '예약상태 - 공통코드(reserve-status)',
reason_cancel_content VARCHAR(4000) NULL COMMENT '예약 취소 사유',
user_id VARCHAR(255) NULL COMMENT '예약자 id',
user_contact_no VARCHAR(50) NULL COMMENT '예약자 연락처',
user_email_addr VARCHAR(500) NULL COMMENT '예약자 이메일',
create_date DATETIME NULL COMMENT '생성일',
created_by VARCHAR(255) NULL COMMENT '생성자',
modified_date DATETIME NULL COMMENT '수정일',
last_modified_by VARCHAR(255) NULL COMMENT '수정자',
PRIMARY KEY (reserve_id)
) ;

4
config/application.yml
View File

@@ -27,12 +27,12 @@ apigateway:
# rabbitmq server
spring:
rabbitmq:
host: ${rabbitmq.hostname:${localhost}}
host: ${rabbitmq.hostname:localhost}
port: 5672
username: guest
password: guest
zipkin:
base-url: http://${zipkin.hostname:${localhost}}:9411
base-url: http://${zipkin.hostname:localhost}:9411
egov:
message: hello

4
frontend/portal/package.json
View File

@@ -8,8 +8,8 @@
},
"scripts": {
"dev": "ts-node --project tsconfig.server.json server/index.ts",
"dev:sm": "SITE_ID=3 npm run dev",
"dev:lg": "SITE_ID=2 npm run dev",
"dev:sm": "set SITE_ID=3&&npm run dev",
"dev:lg": "set SITE_ID=2&&npm run dev",
"build:server": "tsc --project tsconfig.server.json",
"build:next": "next build",
"prebuild": "rimraf ./build",