DeveloperAcademy-POSTECH · piriram · Aug 12, 2024 · Aug 12, 2024 · Aug 12, 2024 · Aug 12, 2024
diff --git a/2024-MC3-Team4-NewT.xcodeproj/project.pbxproj b/2024-MC3-Team4-NewT.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		21353F612C6786570095CA6D /* BeachMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21353F602C6786570095CA6D /* BeachMapper.swift */; };
 		21353F632C6873380095CA6D /* OnboardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21353F622C6873380095CA6D /* OnboardingView.swift */; };
+		21353F652C6A8A8B0095CA6D /* RecordItemView2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21353F642C6A8A8B0095CA6D /* RecordItemView2.swift */; };
 		213A4A742C605E3F00786C97 /* RecordReadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 213A4A732C605E3F00786C97 /* RecordReadView.swift */; };
 		213A4A762C60609600786C97 /* ChartHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 213A4A752C60609600786C97 /* ChartHeaderView.swift */; };
 		21588AFD2C5C75E6003E3489 /* FirebaseSDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21588AFC2C5C75E6003E3489 /* FirebaseSDView.swift */; };
@@ -76,6 +77,7 @@
 /* Begin PBXFileReference section */
 		21353F602C6786570095CA6D /* BeachMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BeachMapper.swift; sourceTree = "<group>"; };
 		21353F622C6873380095CA6D /* OnboardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingView.swift; sourceTree = "<group>"; };
+		21353F642C6A8A8B0095CA6D /* RecordItemView2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecordItemView2.swift; sourceTree = "<group>"; };
 		213A4A732C605E3F00786C97 /* RecordReadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecordReadView.swift; sourceTree = "<group>"; };
 		213A4A752C60609600786C97 /* ChartHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartHeaderView.swift; sourceTree = "<group>"; };
 		21588AFC2C5C75E6003E3489 /* FirebaseSDView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirebaseSDView.swift; sourceTree = "<group>"; };
@@ -162,6 +164,7 @@
 				719EA9CC2C5A56730090BAB5 /* RecordChartView.swift */,
 				712B07632C631EC8001DC52C /* RecordItemView.swift */,
 				213A4A732C605E3F00786C97 /* RecordReadView.swift */,
+				21353F642C6A8A8B0095CA6D /* RecordItemView2.swift */,
 			);
 			path = RecordReadView;
 			sourceTree = "<group>";
@@ -493,6 +496,7 @@
 				719EA9C52C57729E0090BAB5 /* Font.swift in Sources */,
 				21588B082C5CC2CA003E3489 /* DateFormatterManager.swift in Sources */,
 				7159C18E2C60C549007300D6 /* RecordChartViewModel.swift in Sources */,
+				21353F652C6A8A8B0095CA6D /* RecordItemView2.swift in Sources */,
 				21588B142C600CAA003E3489 /* TabBarButton.swift in Sources */,
 				712B07642C631EC8001DC52C /* RecordItemView.swift in Sources */,
 				715BA4CC2C6111FF00477938 /* ModalView.swift in Sources */,

diff --git a/2024-MC3-Team4-NewT/Resource/Utils/DateFormatterManager.swift b/2024-MC3-Team4-NewT/Resource/Utils/DateFormatterManager.swift
@@ -69,4 +69,7 @@ class DateFormatterManager {
         formatter.locale = Locale(identifier: "ko_kr")
         return formatter.string(from: date)
     }
+    func convertDateToString(date: Date) -> String {
+        return longDateFormatter.string(from: date)
+    }
 }
diff --git a/2024-MC3-Team4-NewT/Source/View/MainView/MainView.swift b/2024-MC3-Team4-NewT/Source/View/MainView/MainView.swift
@@ -70,16 +70,7 @@ struct MainView: View {
         .ignoresSafeArea(edges: .bottom)
         .onAppear {
             loadSelectedItem() // 뷰가 나타날 때 UserDefaults에서 선택된 항목을 불러옴
-//            for item in chartRow {
-//                if let aa = item.surfingRecordStartTime {
-//                    print("\(aa):통과")
-//                } else {
-//                    modelContext.delete(item)
-//                }
-//            }
-
-
-//            fbo.fetchFirebase(modelContext: modelContext, collectionName: mappedItem, chartRow: chartRow)
+
         }
         .onChange(of:isLocationChanged){
             loadSelectedItem()

diff --git a/2024-MC3-Team4-NewT/Source/View/RecordReadView/CategoriesView.swift b/2024-MC3-Team4-NewT/Source/View/RecordReadView/CategoriesView.swift
@@ -7,42 +7,46 @@ struct CategoriesView: View {
 
     var body: some View {
         HStack{
-            ForEach(0..<5) { index in
+            Spacer()
+                .frame(width: 25)
+            ForEach(0..<2) { index in
                 Button {
-                    viewModel.categories = index
+                    viewModel.categoryIndex = index
                 } label: {
                     if (index == 0){
                         Text("전체")
                     }
                     else if (index == 1){
                         Text("핀 고정")
                     }
-                    else if (index == 2){
-                        Text("날짜 선택")
-                    }
-                    else if (index == 3){
-                        HStack(spacing: 0){
-                            Text("별점 ")
-                            Image(systemName: "chevron.down")
-                        }
-                    }
-                    else{
-                        HStack(spacing: 0){
-                            Text("최신순 ")
-                            Image(systemName: "chevron.down")
-                        }
-                    }
+//                    else if (index == 2){
+//                        Text("날짜 선택")
+//                    }
+//                    else if (index == 3){
+//                        HStack(spacing: 0){
+//                            Text("별점 ")
+//                            Image(systemName: "chevron.down")
+//                        }
+//                    }
+//                    else{
+//                        HStack(spacing: 0){
+//                            Text("최신순 ")
+//                            Image(systemName: "chevron.down")
+//                        }
+//                    }
                 }.font(.Body2Medium)
-                    .foregroundColor(viewModel.categories == index ? Color.white : Color.black)
+                    .foregroundColor(viewModel.categoryIndex == index ? Color.white : Color.black)
                     .padding(.horizontal, 10)
                     .padding(.vertical, 6)
-                    .background(viewModel.categories == index ? Color("surfBlue") : Color.white)
+                    .background(viewModel.categoryIndex == index ? Color("surfBlue") : Color.white)
                     .cornerRadius(20)
                     .overlay(
                         RoundedRectangle(cornerRadius: 20)
                             .stroke(Color.black.opacity(0.15), lineWidth: 0.75)
                     )
+
             }
+            Spacer()
         }
     }
 }
diff --git a/2024-MC3-Team4-NewT/Source/View/RecordReadView/ModalView.swift b/2024-MC3-Team4-NewT/Source/View/RecordReadView/ModalView.swift
@@ -8,7 +8,7 @@ struct ModalView: View {
     var body: some View {
         ScrollView{
             ForEach(surfingRecordOneData, id: \.id) { item in
-                if ( item.id == viewModel.isID) {
+                if ( item.id == viewModel.chartRowId) {
                     VStack(spacing: 0){
                         HStack{
                             Text(DateFormatterManager.shared.dateFormatter(from: item.surfingStartTime))
@@ -41,7 +41,7 @@ struct ModalView: View {
                                 Text(viewModel.evaluationText(for: item.evaluationValue))
                                     .font(.Body2Medium)
                                     .foregroundColor(.black.opacity(0.7))
-
+                                
                             }
                             .padding(5)
                             .background(Color("backgroundSkyblue"))
@@ -59,7 +59,7 @@ struct ModalView: View {
                         RecordChartTestView(viewModel: viewModel, recordOne: item)
 
                     }.padding(.horizontal)
-//                        .overlay(.yellow.opacity(0.3))
+                    //                        .overlay(.yellow.opacity(0.3))
                         .padding(.vertical, 30)
 
                 }

diff --git a/2024-MC3-Team4-NewT/Source/View/RecordReadView/RecordChartTestView.swift b/2024-MC3-Team4-NewT/Source/View/RecordReadView/RecordChartTestView.swift
@@ -7,9 +7,8 @@ struct RecordChartTestView: View {
     @Query(sort: \ChartRow.time) var chartRow: [ChartRow]
     var recordOne: SurfingRecordOne
     @EnvironmentObject var myObject: MyObservableObject
-    @State private var showAlert = false
     @State private var selectedItem: ChartRow?
-
+    @State var kkk = false
     var body: some View {
         VStack(spacing: 0) {
             let data = viewModel.filteredRecordChart(charts: chartRow, recordOne: recordOne)
@@ -44,24 +43,20 @@ struct RecordChartTestView: View {
                                     if viewModel.isPinButton[recordOne.id] == true {
                                         Button {
                                             selectedItem = row
-                                            showAlert = true
-                                            viewModel.isChartPinButotn[row.id, default: false].toggle()
-                                            //                                            print ("고정 row: \(row.id)")
-                                            if (viewModel.isChartPinButotn[row.id] == true && viewModel.isPinCounter < 3) {
-                                                viewModel.isPinCounter += 1
-                                            }
-                                            else if (viewModel.isChartPinButotn[row.id] == false) {
-                                                viewModel.isPinCounter -= 1
-                                                viewModel.isChartPinButotn[row.id] = false
-                                            }
-                                            else {
-                                                viewModel.isChartPinButotn[row.id] = false
-                                            }
 
+                                            viewModel.isChartPinButton[row.id, default: false].toggle()
+                                            viewModel.rowTime = row.time
+                                            viewModel.pinRecord = row.surfingRecordStartTime ?? Date()
+                                            viewModel.confirmPin(row.time, row.surfingRecordStartTime ?? Date())
+                                            viewModel.isRecord = true
+                                            if viewModel.isRecord == false {
+                                                kkk = true
+                                            }
+
                                         } label: {
                                             Image(systemName: "checkmark.circle.fill")
                                                 .frame(width: 20)
-                                                .foregroundColor(viewModel.isChartPinButotn[row.id] == true ? Color("surfBlue") : Color(.systemGroupedBackground))
+                                                .foregroundColor(viewModel.isChartPinButton[row.id] == true ? Color("surfBlue") : Color(.systemGroupedBackground))
                                         }
                                     }
                                     Text(DateFormatterManager.shared.timeToHourFormatter(row.time))
@@ -103,26 +98,26 @@ struct RecordChartTestView: View {
                                 .padding(.horizontal, 10)
                             }
                         }
-                        .onAppear{
-                            print ("****row: \(row.id)")
-                        }
+
                     }
                 }
             }
+
         }
-        .alert(isPresented: $showAlert) {
+        .alert(isPresented: $kkk) {
             Alert(
                 title: Text("차트를 고정하시겠습니까?"),
-                primaryButton: .default(Text("Yes"), action: {
-                    if let item = selectedItem {
-                        myObject.pinChart.append(item)
-//                        DateFormatterManager.shared.dateFromString("1999-11-19 00:00:00")
-//                        try? modelContext.save()
-                        print("Selected index: \(index)")
-                    }
-                }),
-                secondaryButton: .cancel(Text("No"))
+                primaryButton: .default(Text("네")) {
+                    print("Pin saved.")
+                    viewModel.savePinTime(viewModel.rowTime, viewModel.pinRecord)
+                    viewModel.isChartPinButton[viewModel.chartRowId] = false
+                    viewModel.isPinButton[viewModel.recordId] = false
+                },
+                secondaryButton: .cancel(Text("취소"))
             )
         }
+
+
     }
+
 }
diff --git a/2024-MC3-Team4-NewT/Source/View/RecordReadView/RecordChartView.swift b/2024-MC3-Team4-NewT/Source/View/RecordReadView/RecordChartView.swift
@@ -7,6 +7,13 @@ struct RecordChartView: View {
     @Query private var surfingRecordOneData: [SurfingRecordOne]
     @ObservedObject var viewModel = RecordChartViewModel()
     @State var isLocationSelected = false
+    private let selectionKey = "selectionKey"
+    @State private var selectedItem: String = ""
+    @State private var mappedItem: String = ""
+    private let defaultItem = "포항 월포해변"
+    private let pinRecordKey = "pinRecord"
+
+
     var body: some View {
         NavigationStack {
             ZStack {
@@ -16,7 +23,7 @@ struct RecordChartView: View {
                 VStack(spacing: 0) {
                     NavigationLink(destination: LocationView(isLocationSelected: $isLocationSelected)) {
                         HStack {
-                            Text(viewModel.selectedItem ?? "포항 신항만해변A")
+                            Text(selectedItem)
                                 .font(.SubheadingSemiBold)
                             Image(systemName: "chevron.down")
                             Spacer()
@@ -28,24 +35,90 @@ struct RecordChartView: View {
 
                     CategoriesView(viewModel: viewModel)
 
-                    Spacer().frame(height: 16)
+                    Spacer()
+                        .frame(height: 16)
 
-                    ScrollView {
-                        ForEach(surfingRecordOneData, id: \.id) { item in
-                            RecordItemView(item: item, viewModel: viewModel)
-                                .onAppear{
-                                    print("큰 차트 item.id \(item.id)")
-                                }
-
-
+                    if viewModel.categoryIndex == 0 {
+                        // 카테고리 0에 대한 처리
+                        ScrollView {
+                            ForEach(surfingRecordOneData, id: \.id) { item in
+                                RecordItemView(item: item, viewModel: viewModel)
+                                    .onAppear{
+                                        print("큰 차트 item.id \(item.id)")
+                                    }
+                            }
+                            Spacer()
+                                .frame(height: 60)
+                        }
+                    } else if viewModel.categoryIndex == 1 {
+                        // pinRecord에 저장된 값과 일치하는 surfingStartTime을 가진 Record만 표시
+                        ScrollView {
+                            let pinnedRecords = getPinnedRecords()
+                            ForEach(pinnedRecords, id: \.id) { item in
+                                RecordItemView2(item: item, viewModel: viewModel)
+                            }
+                            Spacer()
+                                .frame(height: 60)
                         }
-                        Spacer()
-                            .frame(height: 60)
                     }
-                }.padding(.top, 50)
+                }
+                .padding(.top, 50)
             }
         }
+        .onAppear{
+            aaa()
+        }
+    }
+
+    func aaa(){
+        if let savedItem = UserDefaults.standard.string(forKey: selectionKey) {
+            let components = savedItem.split(separator: " ", maxSplits: 1) // 첫 번째로만 분리
+            if components.count == 2 {
+                let regionName = String(components[0])
+                let itemName = String(components[1])
+
+                selectedItem = itemName
+                // 매핑된 값이 존재하면 mappedItem에 저장, 그렇지 않으면 빈 문자열로 초기화
+                if let mappedValue = beachToEnglishMap["\(itemName)"] {
+                    mappedItem = mappedValue
+                } else {
+                    mappedItem = ""
+                }
+            }
+
+            print("로드:\(selectedItem), 매핑된 값:\(mappedItem)")
+        } else {
+            // UserDefaults에 값이 없으면 기본값 설정
+            selectedItem = defaultItem
+            if let defaultMappedValue = beachToEnglishMap[defaultItem] {
+                mappedItem = defaultMappedValue
+            } else {
+                mappedItem = ""
+            }
+            UserDefaults.standard.set(defaultItem, forKey: selectionKey) // 기본값을 UserDefaults에 저장
+        }
+    }
+
+    // UserDefaults에서 pinRecord를 불러와 필터링된 Record 배열 반환
+    func getPinnedRecords() -> [SurfingRecordOne] {
+        guard let pinnedStartTimesStrings = UserDefaults.standard.array(forKey: "pinRecord") as? [String] else {
+            return []
+        }
+
+        let pinnedStartTimes = pinnedStartTimesStrings.compactMap { DateFormatterManager.shared.longDateFormatter.date(from: $0) }
+
+        print("핀시작:\(pinnedStartTimes)")
+        for item in surfingRecordOneData {
+            print("데이터:\(item.surfingStartTime)")
+        }
+
+        let filteredRecords = surfingRecordOneData.filter { item in
+            pinnedStartTimes.contains { pinnedTime in
+                DateFormatterManager.shared.longDateFormatter.string(from: pinnedTime) == DateFormatterManager.shared.longDateFormatter.string(from: item.surfingStartTime)
+            }
+        }
+
+        return filteredRecords
     }
-}
-
 
+}