Skip to content

Commit f298b62

Browse files
Merge pull request #411 from GSM-MSG/develop
🔀 :: master에 머지
2 parents aae5cd6 + b602a6b commit f298b62

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.github/workflows/sms_backend_develop_cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ jobs:
9797
description: 무례하긴, 실패다.
9898
color: FF0000
9999
username: SMS CD 봇
100-
url: https://github.com/GSM-MSG/SMS-BackEnd
100+
url: https://github.com/GSM-MSG/SMS-BackEnd

.github/workflows/sms_backend_master_cd.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: sms-production-CD
33
on:
44
push:
55
branches: [ "master" ]
6+
workflow_dispatch:
7+
branches:
8+
- '*'
69

710
jobs:
811
cd:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# SMS-BackEnd
1+
# SMS-BackEnd

sms-core/src/main/kotlin/team/msg/sms/domain/user/usecase/QueryCurrentUserProfileDetailUseCase.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,6 @@ class QueryCurrentUserProfileDetailUseCase(
115115
techStacks.find { it.id == studentTechStack.techStackId }
116116

117117
private fun getStudentPortfolioUrl(student: Student.StudentWithUserInfo): String {
118-
return when {
119-
!student.portfolioUrl.isNullOrBlank() -> student.portfolioUrl
120-
!student.portfolioFileUrl.isNullOrBlank() -> student.portfolioFileUrl
121-
else -> ""
122-
}
118+
return if(!student.portfolioUrl.isNullOrBlank()) student.portfolioUrl else ""
123119
}
124120
}

sms-presentation/src/main/kotlin/team/msg/sms/common/WebMvcConfig.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ class WebMvcConfig : WebMvcConfigurer {
1212
.allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")
1313
.allowedOrigins(
1414
"http://localhost:3000",
15-
"https://sms.msg-team.com"
15+
"https://sms.msg-team.com",
16+
"https://sms-test.msg-team.com"
1617
)
1718
.allowedHeaders("*")
1819
.allowCredentials(true)

0 commit comments

Comments
 (0)