Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ hs_err_pid*
replay_pid*

### Maven ###
target/
papplan/target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
Expand All @@ -219,4 +219,8 @@ buildNumber.properties
# JDT-specific (Eclipse Java Development Tools)
.classpath

# End of https://www.toptal.com/developers/gitignore/api/java,eclipse,intellij,maven
# End of https://www.toptal.com/developers/gitignore/api/java,eclipse,intellij,maven

# jenkin
test.db.lock.db
papplan/.DS_Store
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,20 @@ $ sudo docker compose -f docker-compose.yml up -d --build --force-recreate
![image](https://github.com/T2-Papillon/Spring/assets/66417882/71266733-a824-4598-ae23-279c961f6e4b)
- github action, AWS CodeDeploy 활용
- [URL](http://3.114.241.233/8888)

## Applying jekins source code analysis
```bash
$ ./mvnw clean pacakge
$ ./mvnw site

$ cd ..
$ ls -l papplan/target/checkstyle-result.xml
$ ls -l papplan/target/site/spotbugs.xml

$ ./mvnw test -DargLine="-Dspring.profiles.active=test" -Dmaven.test.failure.ignore=true
$ ./mvnw package -DargLine="-Dspring.profiles.active=test" -Dmaven.test.failure.ignore=true
$ ./mvnw jacoco:report -DargLine="-Dspring.profiles.active=test" -Dmaven.test.failure.ignore=true
```

## Ref
- https://www.jacoco.org/jacoco/trunk/doc/maven.html
87 changes: 87 additions & 0 deletions papplan/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,32 @@
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>

<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.8.4.0</version>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.2.224</version>
<scope>test</scope>
</dependency>
</dependencies>


<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
Expand All @@ -87,7 +109,72 @@
<mainClass>com.boogle.papplan.PapplanApplication</mainClass>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.5.0</version>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.4</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>

</plugins>
</build>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.1</version>
<reportSets>
<reportSet>
<reports>
<report>checkstyle</report>
</reports>
</reportSet>
</reportSets>
</plugin>

<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.8.4.0</version>
<configuration>
<xmlOutput>true</xmlOutput>
<effort>Max</effort>
<threshold>Low</threshold>
<spotbugsXmlOutputFilename>spotbugsReport.xml</spotbugsXmlOutputFilename>
</configuration>
</plugin>
</plugins>
</reporting>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
import com.boogle.papplan.dto.project.ProjectDTO;
import com.boogle.papplan.service.project.ProjectService;
import com.boogle.papplan.service.task.TaskService;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

@RestController
@RequestMapping("/api/dashboard")
Expand Down
2 changes: 0 additions & 2 deletions papplan/src/main/java/com/boogle/papplan/dto/TaskDTO.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.boogle.papplan.dto;

import com.boogle.papplan.entity.TaskPriority;
import com.boogle.papplan.entity.TaskStatus;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.Date;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.boogle.papplan.dto.EmployeeDTO;
import com.boogle.papplan.entity.Employees;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;

Expand Down
2 changes: 1 addition & 1 deletion papplan/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ logging:
SQL: debug

devtools:
liverload:
LiveReload:
enable: true
29 changes: 29 additions & 0 deletions papplan/src/main/resources/application-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
spring:
sql:
init:
platform: mariadb
encoding: UTF-8
mode: always
schema-locations: classpath:init-db-script/a_create_table.sql
data-locations: classpath:init-db-script/b_insert_table.sql
datasource:
driver-class-name: org.h2.Driver
url: jdbc:h2:mem:test;MODE=MariaDB
username: sa
password:
jpa:
hibernate:
ddl-auto: update
generate-ddl: false
show-sql: true

# Hibernate SQL ?? ?? ??
logging:
level:
org:
hibernate:
SQL: debug

devtools:
LiveReload:
enable: true
2 changes: 1 addition & 1 deletion papplan/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ spring:
spring:
config:
activate:
on-profile: local, dev, prd
on-profile: local, dev, prd, test
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.test.context.transaction.BeforeTransaction;
import org.springframework.transaction.annotation.Transactional;

import java.util.Optional;

import static org.junit.jupiter.api.Assertions.*;

@SpringBootTest
class EmployeeServiceImplTest {

Expand Down
90 changes: 90 additions & 0 deletions papplan/src/test/resources/init-db-script/a_create_table.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@

CREATE TABLE department (
dept_name varchar(20) NOT NULL,
dept_no varchar(20) NOT NULL
)
;

CREATE TABLE job_title (
position_id varchar(20) NOT NULL,
position_name varchar(20) NOT NULL
)
;

CREATE TABLE employees (
eno int(11) NOT NULL AUTO_INCREMENT,
dept_no varchar(20) NOT NULL,
name varchar(20) NOT NULL,
position_id varchar(20) NOT NULL,
email varchar(50) NOT NULL,
password varchar(65) NOT NULL
)
;

CREATE TABLE project_priority (
project_priority_id varchar(20) NOT NULL,
project_priority_name varchar(20) NOT NULL
)
;

CREATE TABLE project_status (
project_status_id varchar(20) NOT NULL,
project_status_name varchar(20) NOT NULL
)
;

CREATE TABLE project (
proj_create_date date NOT NULL,
proj_end_date date NOT NULL,
proj_no int(11) NOT NULL AUTO_INCREMENT,
proj_percent int(11) DEFAULT NULL,
proj_start_date date NOT NULL,
projp_no varchar(20) NOT NULL,
projs_no varchar(20) NOT NULL,
proj_pm int(11) NOT NULL,
proj_title varchar(50) NOT NULL,
proj_desc varchar(300) NOT NULL
)
;

CREATE TABLE contributor (
eno int(11) NOT NULL,
proj_no int(11) NOT NULL,
id bigint(20) NOT NULL AUTO_INCREMENT
)
;

CREATE TABLE task_status (
task_status_id varchar(20) NOT NULL,
task_status_name varchar(20) NOT NULL
)
;


CREATE TABLE task_priority (
task_priority_id varchar(20) NOT NULL,
task_priority_name varchar(20) NOT NULL,
weight double DEFAULT NULL
)
;


CREATE TABLE task (
proj_no int(11) NOT NULL,
task_create_date date NOT NULL,
task_end_date date NOT NULL,
task_no int(11) NOT NULL AUTO_INCREMENT,
task_percent int(11) NOT NULL,
task_start_date date NOT NULL,
task_test bit(1) NOT NULL,
task_update_date date DEFAULT NULL,
assignee varchar(20) NOT NULL,
task_priority_id varchar(20) NOT NULL,
task_status_id varchar(20) NOT NULL,
task_title varchar(50) NOT NULL,
task_desc varchar(300) NOT NULL,
task_finish_date date DEFAULT NULL,
task_test_url varchar(255) DEFAULT NULL,
assignee_eno int(11) NOT NULL
)
;
Loading