Deploy 1.0

.github/workflows/main.yml

@@ -0,0 +1,69 @@
+# cicd.yml
+# github repository Actions 페이지에 나타낼 이름
+name: LogIT A CI/CD with Gradle
+
+# event trigger
+# main, develop 브랜치에 push, pr 생성시 실행되는 트리거
+on:
+  pull_request:
+    branches: [ "main" ]
+
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    steps:
+      ## jdk setting
+      - uses: actions/checkout@v3
+      - name: 🐧Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      ## gradle caching
+      - name: 🐧Gradle Caching
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: 🐧application.yml 파일을 생성 합니다.
+        run: |
+          mkdir -p ./src/main/resources  # 디렉토리가 없으면 생성
+          touch ./src/main/resources/application.yml  # application.yml 파일 생성
+          echo "${{ secrets.PROPERTIES }}" > ./src/main/resources/application.yml
+        shell: bash
+
+      - name: 🐧gradle build를 위한 권한을 부여합니다.
+        run: chmod +x gradlew
+
+      - name: 🐧gradle build 중입니다.
+        run: ./gradlew build
+        shell: bash # ci는 여기까지
+
+      - name: 🐧docker image build 후 docker hub에 push합니다.
+        run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -f Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_IMAGE }} .
+          docker push ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_IMAGE }}
+
+      ## deploy to production
+      - name:  docker hub에서 pull 후 deploy합니다.
+        uses: appleboy/ssh-action@master
+        #        id: deploy-prod
+        with:
+          username: ${{ secrets.EC2_USERNAME }}
+          host: ${{ secrets.EC2_HOST }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          envs: GITHUB_SHA
+          script: |
+            cd logit-server
+            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_IMAGE }}
+            sudo docker rm -f $(sudo docker ps -aq) || true 
+            sudo docker-compose up -d
+            sudo docker image prune -f

.gitignore

@@ -35,3 +35,5 @@ out/
 
 ### VS Code ###
 .vscode/
+
+application.yml

Dockerfile

@@ -0,0 +1,14 @@
+# 도커 이미지 지정
+FROM openjdk:21
+
+WORKDIR /app/logit
+
+# 빌드된 파일의 위치를 argument로 지정
+ARG JAR_PATH=../build/libs
+ARG RESOURCE_PATH=../build/resources/main/
+
+# 위의 경로의 파일을 이미지 내부의 app.jar로 복사
+COPY ${JAR_PATH}/*.jar /app/logit/LogIT.jar
+
+# 컨테이너 시작시 명령어. 즉 해당 jar파일을 실행하겠다는 것
+ENTRYPOINT [ "java", "-jar",  "LogIT.jar" ]

build.gradle

@@ -24,12 +24,44 @@ repositories {
 }
 
 dependencies {
+	// web
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+
+	// lombok
 	compileOnly 'org.projectlombok:lombok'
-	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
+
+	// mysql
+	runtimeOnly 'com.mysql:mysql-connector-j'
+
+	// test
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+	// validation
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
+
+	// jpa
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+
+	// swagger
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.4'
+
+	// spring security
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+	testImplementation 'org.springframework.security:spring-security-test'
+	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+
+	//Jwt
+	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+	implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
+	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+	// GSON
+	implementation 'com.google.code.gson:gson:2.11.0'
+
+	// redis
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 }
 
 tasks.named('test') {

src/main/java/LogITBackend/LogIT/DTO/BranchResponseDTO.java

@@ -0,0 +1,10 @@
+package LogITBackend.LogIT.DTO;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class BranchResponseDTO {
+    private String branchName;
+}

src/main/java/LogITBackend/LogIT/DTO/CategoryRequestDTO.java

@@ -0,0 +1,18 @@
+package LogITBackend.LogIT.DTO;
+
+import LogITBackend.LogIT.domain.CodeCategories;
+import LogITBackend.LogIT.domain.Users;
+import lombok.Getter;
+
+@Getter
+public class CategoryRequestDTO {
+    private String category;
+
+    public CodeCategories ToEntity(Users user) {
+        return CodeCategories.builder()
+                .name(category)
+                .users(user)
+                .build();
+
+    }
+}

src/main/java/LogITBackend/LogIT/DTO/CategoryResponseDTO.java

@@ -0,0 +1,17 @@
+package LogITBackend.LogIT.DTO;
+
+import LogITBackend.LogIT.domain.CodeCategories;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class CategoryResponseDTO {
+    private String category;
+
+    public static CategoryResponseDTO ToDTO(CodeCategories category) {
+        return CategoryResponseDTO.builder()
+                .category(category.getName())
+                .build();
+    }
+}

src/main/java/LogITBackend/LogIT/DTO/CodeRequestDTO.java

@@ -0,0 +1,30 @@
+package LogITBackend.LogIT.DTO;
+
+import LogITBackend.LogIT.domain.CodeCategories;
+import LogITBackend.LogIT.domain.Codes;
+import LogITBackend.LogIT.domain.Users;
+import lombok.Getter;
+
+@Getter
+public class CodeRequestDTO {
+    public String title;
+    public String filePath;
+    public int line;
+    public String content;
+    public String code;
+    public String category;
+
+    public Codes toEntity(Users user, CodeCategories category) {
+        return Codes.builder()
+                .users(user)
+                .fileLocation(filePath)
+                .title(title)
+                .code(code)
+                .content(content)
+                .line(line)
+                .codeCategories(category)
+                .build();
+
+
+    }
+}

src/main/java/LogITBackend/LogIT/DTO/CodeResponseDTO.java

@@ -0,0 +1,25 @@
+package LogITBackend.LogIT.DTO;
+
+import LogITBackend.LogIT.domain.Codes;
+import lombok.Builder;
+
+@Builder
+public class CodeResponseDTO {
+    public String title;
+    public String filePath;
+    public int line;
+    public String content;
+    public String code;
+    public String category;
+
+    public static CodeResponseDTO toDTO(Codes codes) {
+        return CodeResponseDTO.builder()
+                .title(codes.getTitle())
+                .content(codes.getContent())
+                .line(codes.getLine())
+                .filePath(codes.getFileLocation())
+                .category(codes.getCodeCategories().getName())
+                .code(codes.getCode())
+                .build();
+    }
+}

src/main/java/LogITBackend/LogIT/DTO/CommitDetailResponseDTO.java

@@ -0,0 +1,15 @@
+package LogITBackend.LogIT.DTO;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CommitDetailResponseDTO {
+    private CommitResponseDTO commitResponseDTO;
+    private List<FileResponseDTO> files;
+}

src/main/java/LogITBackend/LogIT/DTO/CommitResponseDTO.java

@@ -0,0 +1,30 @@
+package LogITBackend.LogIT.DTO;
+
+
+import LogITBackend.LogIT.domain.Commit;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CommitResponseDTO {
+    private String id; //Commit id
+    private Long repo_id;
+    private String message;
+    private String stats;
+    private LocalDateTime date;
+
+    public static CommitResponseDTO fromEntity(Commit commit) {
+        return new CommitResponseDTO(
+                commit.getId(),
+                commit.getBranch().getId(),
+                commit.getMessage(),
+                commit.getStats(),
+                commit.getDate()
+        );
+    }
+}

src/main/java/LogITBackend/LogIT/DTO/FileResponseDTO.java

@@ -0,0 +1,40 @@
+package LogITBackend.LogIT.DTO;
+
+import LogITBackend.LogIT.domain.File;
+import jakarta.persistence.Column;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.LastModifiedDate;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FileResponseDTO {
+    private Long id;
+
+    private String filename;
+
+    private Long additions;
+
+    private Long deletions;
+
+    private String patch;
+
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+
+    public static FileResponseDTO fromEntity(File file) {
+        return new FileResponseDTO(
+                file.getId(),
+                file.getFilename(),
+                file.getAdditions(),
+                file.getDeletions(),
+                file.getPatch(),
+                file.getCreatedAt(),
+                file.getUpdatedAt()
+        );
+    }
+}

src/main/java/LogITBackend/LogIT/DTO/GithubRepoResponse.java

@@ -0,0 +1,15 @@
+package LogITBackend.LogIT.DTO;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GithubRepoResponse {
+    private String ownerName;
+    private List<RepositoryResponseDTO> repoList;
+}

src/main/java/LogITBackend/LogIT/DTO/OrgResponse.java

@@ -0,0 +1,12 @@
+package LogITBackend.LogIT.DTO;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrgResponse {
+    private String OrgName;
+}

src/main/java/LogITBackend/LogIT/DTO/RecordRequestDTO.java

@@ -0,0 +1,28 @@
+package LogITBackend.LogIT.DTO;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.Optional;
+
+public class RecordRequestDTO {
+    @Getter
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class CreateRecordRequestDTO {
+        private String title;
+        private String content;
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class EditRecordRequestDTO {
+        private Optional<String> title;
+        private Optional<String> content;
+    }
+}