pull main

.github/workflows/stag-client-api-deploy.yml

@@ -0,0 +1,48 @@
+name: stag-client-api-deploy
+
+on: 
+  push: 
+    branches: [ "stag/client" ]
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+
+      - name: app clean
+        run: ./gradlew clean
+
+      - name: client api build
+        run: ./gradlew :likelion-client:build -x test
+
+      - name: Docker login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_EMAIL }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: ./likelion-client
+          push: true
+          tags: ${{ secrets.DOCKER_CLIENT_API_STAG_IMAGE }}
+          build-args: PROFILE=stag
+
+      - name: client-api-deploy
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          username: ubuntu
+          key: ${{ secrets.KEY }}
+          script: |
+            sudo docker rm -f ${{ secrets.DOCKER_CLIENT_API_STAG_CONTAINER }}
+            sudo docker rmi ${{ secrets.DOCKER_CLIENT_API_STAG_IMAGE }}
+            docker-compose -f ${{ secrets.DOCKER_COMPOSE_DIRECTORY }} up -d
+            docker image prune -f

.gitignore

@@ -40,3 +40,6 @@ out/
 ### env file ###
 .env.dev
 .env.*
+
+### .DS_Store ignore ###
+.DS_Store

build.gradle

@@ -1,19 +1,23 @@
 plugins {
-	id 'java'
+	id 'java-library'
 	id 'org.springframework.boot' version '2.7.13'
 	id 'io.spring.dependency-management' version '1.0.15.RELEASE'
 }
 
-group = 'likelion.univ'
-version = '0.0.1-SNAPSHOT'
-
-java {
-	sourceCompatibility = '17'
-}
+allprojects {
+	group = 'likelion.univ'
+	version = '0.0.1-SNAPSHOT'
 
-configurations {
-	compileOnly {
-		extendsFrom annotationProcessor
+	java {
+		sourceCompatibility = 17
+		targetCompatibility = 17
+	}
+	repositories {
+		mavenCentral()
+	}
+	dependencies {
+//		implementation 'org.springframework.boot:spring-boot-starter'
+//		annotationProcessor('org.springframework.boot:spring-boot-configuration-processor:3.0.4')
 	}
 }
 
@@ -30,21 +34,23 @@ subprojects {
 	apply plugin: 'org.springframework.boot'
 	apply plugin: 'io.spring.dependency-management'
 
-	sourceCompatibility = 17
-	targetCompatibility = 17
-
-	group = 'likelion.univ'
-	version = '0.0.1-SNAPSHOT'
-
-	repositories {
-		mavenCentral()
+	configurations {
+		compileOnly {
+			extendsFrom annotationProcessor
+		}
 	}
-
 	dependencies {
 		implementation 'org.springframework.boot:spring-boot-starter'
 		testImplementation 'org.springframework.boot:spring-boot-starter-test'
 		compileOnly 'org.projectlombok:lombok'
 		annotationProcessor 'org.projectlombok:lombok'
 		annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 	}
-}
+	test {
+		useJUnitPlatform()
+	}
+}
+bootJar {
+	enabled = false
+}
+

likelion-admin/Dockerfile

@@ -1,6 +1,5 @@
 FROM openjdk:17
-ARG JAR_FILE=build/libs/*.jar
+ARG JAR_FILE=./build/libs/*.jar
 COPY ${JAR_FILE} app.jar
-EXPOSE 8090
 
-ENTRYPOINT ["java","-jar","-Duser.timezone=Asia/Seoul","-Dspring.profiles.active=${PROFILE}","/app.jar"]
+ENTRYPOINT ["java","-jar","-Duser.timezone=Asia/Seoul","-Dspring.profiles.active=${PROFILE}","/app.jar"]

likelion-admin/build.gradle

@@ -1,15 +1,5 @@
-plugins {
-    id 'java'
-}
-
-group = 'likelion.univ'
-version = '0.0.1-SNAPSHOT'
-
-repositories {
-    mavenCentral()
-}
-
 dependencies {
+
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     testImplementation platform('org.junit:junit-bom:5.9.1')
     testImplementation 'org.junit.jupiter:junit-jupiter'
@@ -28,14 +18,3 @@ dependencies {
     implementation project(':likelion-infrastructure')
 }
 
-test {
-    useJUnitPlatform()
-}
-
-bootJar {
-    enabled = true
-}
-
-jar {
-    enabled = true
-}

likelion-admin/src/main/resources/application.yml

@@ -42,4 +42,4 @@ spring:
 spring:
   config:
     activate:
-      on-profile: prod
+      on-profile: prod

likelion-client/Dockerfile

@@ -1,5 +1,4 @@
 FROM openjdk:17
-ARG JAR_FILE=build/libs/*.jar
-COPY ${JAR_FILE} app.jar
+COPY ./build/libs/*.jar app.jar
 
-ENTRYPOINT ["java","-jar","-Duser.timezone=Asia/Seoul","-Dspring.profiles.active=${PROFILE}","/app.jar"]
+ENTRYPOINT ["java","-jar","-Duser.timezone=Asia/Seoul","-Dspring.profiles.active=${PROFILE}","/app.jar"]

likelion-client/build.gradle

@@ -1,18 +1,6 @@
-plugins {
-    id 'java'
-}
-
-group = 'likelion.univ'
-version = '0.0.1-SNAPSHOT'
-
-repositories {
-    mavenCentral()
-}
-
 dependencies {
-    /* pageable */
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+
     /* security */
     implementation 'org.springframework.boot:spring-boot-starter-security'
     /* swagger */
@@ -23,6 +11,8 @@ dependencies {
     testImplementation platform('org.junit:junit-bom:5.9.1')
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
+
+
     /* core 모듈 추가  */
     implementation project(':likelion-core')
     /* redis 모듈 추가  */
@@ -35,14 +25,3 @@ dependencies {
     implementation project(':likelion-infrastructure')
 }
 
-test {
-    useJUnitPlatform()
-}
-
-bootJar {
-    enabled = true
-}
-
-jar {
-    enabled = true
-}

likelion-client/src/main/java/likelion/univ/auth/controller/AuthController.java

@@ -10,6 +10,7 @@
 import likelion.univ.auth.usecase.SignUpUseCase;
 import likelion.univ.auth.dto.request.SignUpRequestDto;
 import likelion.univ.response.SuccessResponse;
+import likelion.univ.utils.AuthentiatedUserUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,6 +24,7 @@ public class AuthController {
     private final RequestIdTokenUseCase requestIdTokenUseCase;
     private final SignUpUseCase signUpUseCase;
     private final RefreshTokenUseCase refreshTokenUseCase;
+    private final AuthentiatedUserUtils userUtils;
 
     @Operation(summary = "id token 발급", description = "인가 코드로 id token을 발급받습니다.")
     @GetMapping("/{logintype}/idtoken")
@@ -49,7 +51,6 @@ public SuccessResponse<Object> signUp(
             @RequestParam("idtoken") String idToken,
             @PathVariable("logintype") String loginType,
             @RequestBody SignUpRequestDto signUpRequestDto){
-
         AccountTokenDto accountTokenDto = signUpUseCase.execute(loginType,idToken,signUpRequestDto);
         return SuccessResponse.of(accountTokenDto);
     }
@@ -61,4 +62,10 @@ public SuccessResponse<Object> refreshToken(
         AccountTokenDto accountTokenDto = refreshTokenUseCase.execute(refreshToken);
         return SuccessResponse.of(accountTokenDto);
     }
+
+    @Operation(summary = "로그인 유저 Id 반환", description = "(for client only) 로그인 중인 유저의 Id를 얻습니다.")
+    @GetMapping("/loginuserid")
+    public SuccessResponse<?> getLoginUserId() {
+        return SuccessResponse.of(userUtils.getCurrentUserId());
+    }
 }

likelion-client/src/main/java/likelion/univ/auth/usecase/SignUpUseCase.java

@@ -28,8 +28,7 @@ public AccountTokenDto execute(String loginType,
                                    SignUpRequestDto signUpRequestDto){
         UserInfoFromIdToken userInfo = loginByIdTokenProcessor.execute(loginType, idToken);
         if (!userAdaptor.checkEmail(userInfo.getEmail())){
-            Profile profile = Profile.profileForSignUp(userInfo.getNickname(),
-                    userInfo.getProfileImage());
+            Profile profile = Profile.fromName(signUpRequestDto.getName());
 
             University university = universityAdaptor.findByName(signUpRequestDto.getUniversityName());
             UniversityInfo universityInfo = UniversityInfo.universityInfoForSignUp(university,