diff --git a/KkuMulKum.xcodeproj/project.pbxproj b/KkuMulKum.xcodeproj/project.pbxproj index b31da6bd..a4e6102a 100644 --- a/KkuMulKum.xcodeproj/project.pbxproj +++ b/KkuMulKum.xcodeproj/project.pbxproj @@ -48,6 +48,12 @@ 78B9286E2C29402C006D9942 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B9286D2C29402C006D9942 /* SceneDelegate.swift */; }; 78B928752C29402E006D9942 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 78B928742C29402E006D9942 /* Assets.xcassets */; }; 78B928782C29402E006D9942 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 78B928762C29402E006D9942 /* LaunchScreen.storyboard */; }; + A3FB184D2C3BF45F001483E5 /* MakeMeetingsRequestModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FB184C2C3BF45F001483E5 /* MakeMeetingsRequestModel.swift */; }; + A3FB184F2C3BF4BC001483E5 /* MakeMeetingsResponseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FB184E2C3BF4BB001483E5 /* MakeMeetingsResponseModel.swift */; }; + A3FB18512C3BF531001483E5 /* RegisterMeetingsResponseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FB18502C3BF531001483E5 /* RegisterMeetingsResponseModel.swift */; }; + A3FB18572C3BF704001483E5 /* MeetingListResponseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FB18562C3BF704001483E5 /* MeetingListResponseModel.swift */; }; + A3FB18592C3BF77D001483E5 /* MeetingInfoResponseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FB18582C3BF77D001483E5 /* MeetingInfoResponseModel.swift */; }; + A3FB185B2C3BF7DF001483E5 /* MeetingMembersResponseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FB185A2C3BF7DF001483E5 /* MeetingMembersResponseModel.swift */; }; DD865B642C3920F000C351A2 /* AppleLoginVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD865B632C3920F000C351A2 /* AppleLoginVC.swift */; }; DDA2EE732C385EB9007C6059 /* MainTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2EE722C385EB9007C6059 /* MainTabBarController.swift */; }; DDA2EE752C385FB1007C6059 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2EE742C385FB1007C6059 /* HomeViewController.swift */; }; @@ -81,7 +87,6 @@ DE9E18892C3BC91000DB76B4 /* ResponseBodyDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18882C3BC91000DB76B4 /* ResponseBodyDTO.swift */; }; DE9E188B2C3BC92500DB76B4 /* EmptyModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E188A2C3BC92500DB76B4 /* EmptyModel.swift */; }; DE9E18922C3BCC9D00DB76B4 /* AuthTemp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18912C3BCC9D00DB76B4 /* AuthTemp.swift */; }; - DE9E18962C3BCCAC00DB76B4 /* MeetingsTemp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18952C3BCCAC00DB76B4 /* MeetingsTemp.swift */; }; DE9E18982C3BCCB800DB76B4 /* PromisesTemp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18972C3BCCB800DB76B4 /* PromisesTemp.swift */; }; DE9E189A2C3BCCBE00DB76B4 /* UtilsTemp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18992C3BCCBE00DB76B4 /* UtilsTemp.swift */; }; DED5DBEC2C345210006ECE7E /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED5DBEB2C345210006ECE7E /* BaseViewController.swift */; }; @@ -100,6 +105,12 @@ 78B928742C29402E006D9942 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 78B928772C29402E006D9942 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 78B928792C29402E006D9942 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + A3FB184C2C3BF45F001483E5 /* MakeMeetingsRequestModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MakeMeetingsRequestModel.swift; sourceTree = ""; }; + A3FB184E2C3BF4BB001483E5 /* MakeMeetingsResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MakeMeetingsResponseModel.swift; sourceTree = ""; }; + A3FB18502C3BF531001483E5 /* RegisterMeetingsResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterMeetingsResponseModel.swift; sourceTree = ""; }; + A3FB18562C3BF704001483E5 /* MeetingListResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingListResponseModel.swift; sourceTree = ""; }; + A3FB18582C3BF77D001483E5 /* MeetingInfoResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingInfoResponseModel.swift; sourceTree = ""; }; + A3FB185A2C3BF7DF001483E5 /* MeetingMembersResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingMembersResponseModel.swift; sourceTree = ""; }; DD865B632C3920F000C351A2 /* AppleLoginVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppleLoginVC.swift; sourceTree = ""; }; DDA2EE722C385EB9007C6059 /* MainTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = ""; }; DDA2EE742C385FB1007C6059 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = ""; }; @@ -133,7 +144,6 @@ DE9E18882C3BC91000DB76B4 /* ResponseBodyDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseBodyDTO.swift; sourceTree = ""; }; DE9E188A2C3BC92500DB76B4 /* EmptyModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyModel.swift; sourceTree = ""; }; DE9E18912C3BCC9D00DB76B4 /* AuthTemp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthTemp.swift; sourceTree = ""; }; - DE9E18952C3BCCAC00DB76B4 /* MeetingsTemp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingsTemp.swift; sourceTree = ""; }; DE9E18972C3BCCB800DB76B4 /* PromisesTemp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromisesTemp.swift; sourceTree = ""; }; DE9E18992C3BCCBE00DB76B4 /* UtilsTemp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UtilsTemp.swift; sourceTree = ""; }; DED5DBEB2C345210006ECE7E /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = ""; }; @@ -419,7 +429,12 @@ DE9E188E2C3BCC6B00DB76B4 /* Meetings */ = { isa = PBXGroup; children = ( - DE9E18952C3BCCAC00DB76B4 /* MeetingsTemp.swift */, + A3FB184C2C3BF45F001483E5 /* MakeMeetingsRequestModel.swift */, + A3FB184E2C3BF4BB001483E5 /* MakeMeetingsResponseModel.swift */, + A3FB18502C3BF531001483E5 /* RegisterMeetingsResponseModel.swift */, + A3FB18562C3BF704001483E5 /* MeetingListResponseModel.swift */, + A3FB18582C3BF77D001483E5 /* MeetingInfoResponseModel.swift */, + A3FB185A2C3BF7DF001483E5 /* MeetingMembersResponseModel.swift */, ); path = Meetings; sourceTree = ""; @@ -589,10 +604,14 @@ files = ( DED5DBF22C34534A006ECE7E /* BaseCollectionReusableView.swift in Sources */, DED5DBEC2C345210006ECE7E /* BaseViewController.swift in Sources */, + A3FB18512C3BF531001483E5 /* RegisterMeetingsResponseModel.swift in Sources */, DE9E188B2C3BC92500DB76B4 /* EmptyModel.swift in Sources */, DDA2EE732C385EB9007C6059 /* MainTabBarController.swift in Sources */, + A3FB184D2C3BF45F001483E5 /* MakeMeetingsRequestModel.swift in Sources */, DD865B642C3920F000C351A2 /* AppleLoginVC.swift in Sources */, + A3FB18592C3BF77D001483E5 /* MeetingInfoResponseModel.swift in Sources */, DE9E18842C3BA84500DB76B4 /* CustomTextField.swift in Sources */, + A3FB184F2C3BF4BC001483E5 /* MakeMeetingsResponseModel.swift in Sources */, DE254AAC2C31192400A4015E /* UILabel+.swift in Sources */, DE254AB72C3119D000A4015E /* ReuseIdentifiable.swift in Sources */, DDA2EE752C385FB1007C6059 /* HomeViewController.swift in Sources */, @@ -605,13 +624,14 @@ DE254AA82C3118EA00A4015E /* UIView+.swift in Sources */, DE254AAE2C31193600A4015E /* UIFont+.swift in Sources */, DE9E189A2C3BCCBE00DB76B4 /* UtilsTemp.swift in Sources */, - DE9E18962C3BCCAC00DB76B4 /* MeetingsTemp.swift in Sources */, + A3FB18572C3BF704001483E5 /* MeetingListResponseModel.swift in Sources */, DE254AB22C31197B00A4015E /* UIButton+.swift in Sources */, DDA2EE772C385FC3007C6059 /* GroupListViewController.swift in Sources */, 78B9286C2C29402C006D9942 /* AppDelegate.swift in Sources */, DED5DBF42C34539A006ECE7E /* BaseTableViewCell.swift in Sources */, 78B9286E2C29402C006D9942 /* SceneDelegate.swift in Sources */, DDA2EE792C385FCF007C6059 /* MyPageViewController.swift in Sources */, + A3FB185B2C3BF7DF001483E5 /* MeetingMembersResponseModel.swift in Sources */, 784E4D9B2C3BBD4D00BC943C /* KakaoLoginVC.swift in Sources */, DE32D1D22C3BF703006848DF /* LoginUserResponseModel.swift in Sources */, DE9E18892C3BC91000DB76B4 /* ResponseBodyDTO.swift in Sources */, diff --git a/KkuMulKum.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/KkuMulKum.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 909b8cd7..18a5e959 100644 --- a/KkuMulKum.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/KkuMulKum.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,4 +1,5 @@ { + "originHash" : "e965e5bd1339de125bca61567185acfd41e7aa2dcfa1047d417a53865e4e70dc", "pins" : [ { "identity" : "abseil-cpp-binary", @@ -199,5 +200,5 @@ } } ], - "version" : 2 + "version" : 3 } diff --git a/KkuMulKum/Network/DTO/Model/Meetings/MakeMeetingsRequestModel.swift b/KkuMulKum/Network/DTO/Model/Meetings/MakeMeetingsRequestModel.swift new file mode 100644 index 00000000..5b5db381 --- /dev/null +++ b/KkuMulKum/Network/DTO/Model/Meetings/MakeMeetingsRequestModel.swift @@ -0,0 +1,12 @@ +// +// MakeMeetingsRequestModel.swift +// KkuMulKum +// +// Created by 예삐 on 7/8/24. +// + +import Foundation + +struct MakeMeetingsRequestModel: Codable { + let name: String +} diff --git a/KkuMulKum/Network/DTO/Model/Meetings/MakeMeetingsResponseModel.swift b/KkuMulKum/Network/DTO/Model/Meetings/MakeMeetingsResponseModel.swift new file mode 100644 index 00000000..6fe30f3e --- /dev/null +++ b/KkuMulKum/Network/DTO/Model/Meetings/MakeMeetingsResponseModel.swift @@ -0,0 +1,12 @@ +// +// MakeMeetingsResponseModel.swift +// KkuMulKum +// +// Created by 예삐 on 7/8/24. +// + +import Foundation + +struct MakeMeetingsResponseModel: Codable { + let invitationCode: String +} diff --git a/KkuMulKum/Network/DTO/Model/Meetings/MeetingInfoResponseModel.swift b/KkuMulKum/Network/DTO/Model/Meetings/MeetingInfoResponseModel.swift new file mode 100644 index 00000000..e19a32bb --- /dev/null +++ b/KkuMulKum/Network/DTO/Model/Meetings/MeetingInfoResponseModel.swift @@ -0,0 +1,15 @@ +// +// MeetingInfoResponseModel.swift +// KkuMulKum +// +// Created by 예삐 on 7/8/24. +// + +import Foundation + +struct MeetingInfoResponseModel: Codable { + let id: Int + let name, createdAt: String + let metCount: Int + let invitationCode: String +} diff --git a/KkuMulKum/Network/DTO/Model/Meetings/MeetingListResponseModel.swift b/KkuMulKum/Network/DTO/Model/Meetings/MeetingListResponseModel.swift new file mode 100644 index 00000000..1dd4f43d --- /dev/null +++ b/KkuMulKum/Network/DTO/Model/Meetings/MeetingListResponseModel.swift @@ -0,0 +1,19 @@ +// +// MeetingListResponseModel.swift +// KkuMulKum +// +// Created by 예삐 on 7/8/24. +// + +import Foundation + +struct MeetingListResponseModel: Codable { + let count: Int + let meetings: [Meeting] +} + +struct Meeting: Codable { + let id: Int + let name: String + let memberCount: Int +} diff --git a/KkuMulKum/Network/DTO/Model/Meetings/MeetingMembersResponseModel.swift b/KkuMulKum/Network/DTO/Model/Meetings/MeetingMembersResponseModel.swift new file mode 100644 index 00000000..92b4ba71 --- /dev/null +++ b/KkuMulKum/Network/DTO/Model/Meetings/MeetingMembersResponseModel.swift @@ -0,0 +1,24 @@ +// +// MembersOfMeetingResponseModel.swift +// KkuMulKum +// +// Created by 예삐 on 7/8/24. +// + +import Foundation + +struct MeetingMembersResponseModel: Codable { + let memberCount: Int + let members: [Member] +} + +struct Member: Codable { + let id: Int + let name, profileImageURL: String + + enum CodingKeys: String, CodingKey { + case id + case name + case profileImageURL = "profileImg" + } +} diff --git a/KkuMulKum/Network/DTO/Model/Meetings/MeetingsTemp.swift b/KkuMulKum/Network/DTO/Model/Meetings/MeetingsTemp.swift deleted file mode 100644 index cc9f2114..00000000 --- a/KkuMulKum/Network/DTO/Model/Meetings/MeetingsTemp.swift +++ /dev/null @@ -1,8 +0,0 @@ -// -// MeetingsTemp.swift -// KkuMulKum -// -// Created by 김진웅 on 7/8/24. -// - -import Foundation diff --git a/KkuMulKum/Network/DTO/Model/Meetings/RegisterMeetingsResponseModel.swift b/KkuMulKum/Network/DTO/Model/Meetings/RegisterMeetingsResponseModel.swift new file mode 100644 index 00000000..e8a426ae --- /dev/null +++ b/KkuMulKum/Network/DTO/Model/Meetings/RegisterMeetingsResponseModel.swift @@ -0,0 +1,12 @@ +// +// RegisterMeetingsResponseModel.swift +// KkuMulKum +// +// Created by 예삐 on 7/8/24. +// + +import Foundation + +struct RegisterMeetingsRequestModel: Codable { + let name: String +}