Merge remote-tracking branch 'origin/develop' into Application/499_ed…

…it-mypage
team-xquare · May 29, 2023 · f084e0a · f084e0a
2 parents 7592a58 + 9c2da2b
commit f084e0a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/Application/Sources/Scene/Home/HomeView.swift b/Application/Sources/Scene/Home/HomeView.swift
@@ -51,7 +51,6 @@ struct HomeView: View, XNavigationAndTabContent {
             viewModel.fetchMovedClass()
         })
         .onAppear {
-            viewModel.viewAppear()
             viewModel.fetchTodaysMeal()
             viewModel.fetchUserPoint()
             viewModel.fetchOutingPass()

diff --git a/Application/Sources/Scene/Home/HomeViewModel.swift b/Application/Sources/Scene/Home/HomeViewModel.swift
@@ -96,8 +96,4 @@ class HomeViewModel: ObservableObject {
             })
             .disposed(by: disposeBag)
     }
-    func viewAppear() {
-        self.isShowMovedClass = false
-        self.isShowOutingView = false
-    }
 }
diff --git a/Application/Sources/Scene/OutingPass/OutingPassView.swift b/Application/Sources/Scene/OutingPass/OutingPassView.swift
@@ -17,17 +17,25 @@ struct OutingPassView: View {
             .frame(height: 20)
             .padding(.bottom, 30)
             HStack(alignment: .center) {
-                AsyncImage(url: URL(string: viewModel.outingPassData?.profileFileName ?? "DefaultImage")) { image in
-                    image
-                        .resizable()
-                        .scaledToFill()
-                } placeholder: {
+                if let imageURL = viewModel.outingPassData?.profileFileName {
+                    AsyncImage(url: URL(string: imageURL)) { image in
+                        image
+                            .resizable()
+                            .scaledToFill()
+                    } placeholder: {
+                        Image("DefaultImage")
+                            .resizable()
+                            .scaledToFill()
+                    }
+                    .frame(width: 60, height: 60)
+                    .cornerRadius(30)
+                } else {
                     Image("DefaultImage")
                         .resizable()
                         .scaledToFill()
+                        .frame(width: 60, height: 60)
+                        .cornerRadius(30)
                 }
-                .frame(width: 60, height: 60)
-                .cornerRadius(30)
                 Spacer().frame(width: 16)
                 Text("\(viewModel.outingPassData?.studentNumber ?? "") \(viewModel.outingPassData?.studentName ?? "")")
                     .sdText(type: .heading5)

diff --git a/Services/PickService/Sources/Data/Remote/Response/OutingPassResponse.swift b/Services/PickService/Sources/Data/Remote/Response/OutingPassResponse.swift
@@ -15,7 +15,7 @@ struct OutingPassResponse: Decodable {
 
     }
 
-    let profileFileName: String
+    let profileFileName: String?
     let studentNumber: String
     let studentName: String
     let startTime: String

diff --git a/Services/PickService/Sources/Domain/Entity/OutingPassEntity.swift b/Services/PickService/Sources/Domain/Entity/OutingPassEntity.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 public struct OutingPassEntity: Equatable {
-    public let profileFileName: String
+    public let profileFileName: String?
     public let studentNumber: String
     public let studentName: String
     public let startTime: Date
@@ -11,7 +11,7 @@ public struct OutingPassEntity: Equatable {
     public let picnicDate: Date
 
     public init(
-        profileFileName: String,
+        profileFileName: String?,
         studentNumber: String,
         studentName: String,
         startTime: Date,