Skip to content

Commit

Permalink
Merge branch 'dev' into 6-카카오-로그인
Browse files Browse the repository at this point in the history
  • Loading branch information
dainshon authored Jul 13, 2024
2 parents 58195ce + 0c63f33 commit 3d33c48
Show file tree
Hide file tree
Showing 8 changed files with 88 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ jobs:
port: ${{ secrets.WAS_PORT }}
script: |
sudo docker ps
sudo docker rm -f $(sudo docker ps -qa)
sudo docker pull ${{ secrets.DOCKER_HUB_USERNAME }}/${{ secrets.DOCKER_HUB_REPO_NAME }}:latest
sudo docker run -d -p 9000:9000 ${{ secrets.DOCKER_HUB_USERNAME }}/${{ secrets.DOCKER_HUB_REPO_NAME }}:latest
sudo docker image prune -f
3 changes: 3 additions & 0 deletions src/main/java/inandout/backend/BackendApplication.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package inandout.backend;

import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

@Slf4j
@SpringBootApplication
public class BackendApplication {

public static void main(String[] args) {
SpringApplication.run(BackendApplication.class, args);
log.info("hello inandout");
}

}
1 change: 1 addition & 0 deletions src/main/java/inandout/backend/config/SecurityConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
return http.build();
}
}

1 change: 1 addition & 0 deletions src/main/java/inandout/backend/entity/member/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,5 @@ public Member(String name, String email, String memberImgUrl, String password, P
public String getEmail() {
return email;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,31 @@

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;

@Slf4j
@RequiredArgsConstructor
@RestController
public class HealthCheckController {
private final HealthCheckService healthCheckService;

@GetMapping("/api/test/connection")
public ResponseEntity<Integer> testConnection2() {
log.info("testConnection2");
return ResponseEntity.ok(2);
}

@GetMapping("/healthcheck")
public String testConnection() {
return "CICD SUCCESS";
log.info("testConnection");
return "SUCCESS";
}

@PostMapping("/healthcheckDB")
public Long testDBConnection(@RequestBody HealthDomain healthDomain) {
log.info(healthDomain.getName());
return healthCheckService.saveUser(healthDomain);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package inandout.backend.healthcheck;

import jakarta.persistence.EntityManager;
import jakarta.transaction.Transactional;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;

import java.util.List;

@Slf4j
@Repository
@RequiredArgsConstructor
@Getter
@Transactional
public class HealthCheckRepository {
private final EntityManager em;

public Long save(HealthDomain oauthMember) {
log.info(oauthMember.getName());
em.persist(oauthMember);
return oauthMember.getId();
}

}
15 changes: 15 additions & 0 deletions src/main/java/inandout/backend/healthcheck/HealthCheckService.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package inandout.backend.healthcheck;

import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

@Service
@RequiredArgsConstructor
public class HealthCheckService {
private final HealthCheckRepository healthRepository;

public Long saveUser(HealthDomain oauthMember){
Long savedUser = healthRepository.save(oauthMember);
return savedUser;
}
}
22 changes: 22 additions & 0 deletions src/main/java/inandout/backend/healthcheck/HealthDomain.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package inandout.backend.healthcheck;

import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.DynamicInsert;

@Entity
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@DynamicInsert
public class HealthDomain {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String name;

}

0 comments on commit 3d33c48

Please sign in to comment.