Skip to content

Commit

Permalink
Merge branch 'suyeon' into feat/#133-promise-service
Browse files Browse the repository at this point in the history
  • Loading branch information
youz2me authored Jul 8, 2024
2 parents 27e9698 + 8316b9e commit 3b9de14
Show file tree
Hide file tree
Showing 16 changed files with 211 additions and 33 deletions.
40 changes: 32 additions & 8 deletions KkuMulKum.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
DD3072242C3C0EB200416D9F /* MyPromiseReadyInfoRequestModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3072232C3C0EB200416D9F /* MyPromiseReadyInfoRequestModel.swift */; };
DD3072262C3C0F0B00416D9F /* PromiseLateInfoResponseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3072252C3C0F0B00416D9F /* PromiseLateInfoResponseModel.swift */; };
DD3072282C3C104D00416D9F /* ArrivalCompletionResponseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3072272C3C104D00416D9F /* ArrivalCompletionResponseModel.swift */; };
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 */; };
Expand All @@ -81,15 +87,15 @@
DE254ACA2C311DC200A4015E /* Pretendard-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = DE254AC12C311DC200A4015E /* Pretendard-Light.otf */; };
DE254ACB2C311DC200A4015E /* Pretendard-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = DE254AC22C311DC200A4015E /* Pretendard-Black.otf */; };
DE254ACC2C311DC200A4015E /* Pretendard-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = DE254AC32C311DC200A4015E /* Pretendard-Thin.otf */; };
DE32D1D22C3BF703006848DF /* LoginUserResponseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE32D1D12C3BF703006848DF /* LoginUserResponseModel.swift */; };
DE32D1D42C3BFB56006848DF /* UpdateProfileNameModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE32D1D32C3BFB56006848DF /* UpdateProfileNameModel.swift */; };
DE8247FD2C36E7C7000601BC /* MoyaLoggingPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8247FC2C36E7C7000601BC /* MoyaLoggingPlugin.swift */; };
DE8248002C36E857000601BC /* ObservablePattern.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8247FF2C36E857000601BC /* ObservablePattern.swift */; };
DE9E18802C3BA4AA00DB76B4 /* CustomButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E187F2C3BA4AA00DB76B4 /* CustomButton.swift */; };
DE9E18842C3BA84500DB76B4 /* CustomTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18832C3BA84500DB76B4 /* CustomTextField.swift */; };
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 */; };
DE9E18942C3BCCA300DB76B4 /* UsersTemp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18932C3BCCA300DB76B4 /* UsersTemp.swift */; };
DE9E18962C3BCCAC00DB76B4 /* MeetingsTemp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18952C3BCCAC00DB76B4 /* MeetingsTemp.swift */; };
DE9E189A2C3BCCBE00DB76B4 /* UtilsTemp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18992C3BCCBE00DB76B4 /* UtilsTemp.swift */; };
DED5DBEC2C345210006ECE7E /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED5DBEB2C345210006ECE7E /* BaseViewController.swift */; };
DED5DBEE2C34529A006ECE7E /* BaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED5DBED2C34529A006ECE7E /* BaseView.swift */; };
Expand All @@ -116,6 +122,12 @@
DD3072232C3C0EB200416D9F /* MyPromiseReadyInfoRequestModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPromiseReadyInfoRequestModel.swift; sourceTree = "<group>"; };
DD3072252C3C0F0B00416D9F /* PromiseLateInfoResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromiseLateInfoResponseModel.swift; sourceTree = "<group>"; };
DD3072272C3C104D00416D9F /* ArrivalCompletionResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrivalCompletionResponseModel.swift; sourceTree = "<group>"; };
A3FB184C2C3BF45F001483E5 /* MakeMeetingsRequestModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MakeMeetingsRequestModel.swift; sourceTree = "<group>"; };
A3FB184E2C3BF4BB001483E5 /* MakeMeetingsResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MakeMeetingsResponseModel.swift; sourceTree = "<group>"; };
A3FB18502C3BF531001483E5 /* RegisterMeetingsResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterMeetingsResponseModel.swift; sourceTree = "<group>"; };
A3FB18562C3BF704001483E5 /* MeetingListResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingListResponseModel.swift; sourceTree = "<group>"; };
A3FB18582C3BF77D001483E5 /* MeetingInfoResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingInfoResponseModel.swift; sourceTree = "<group>"; };
A3FB185A2C3BF7DF001483E5 /* MeetingMembersResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingMembersResponseModel.swift; sourceTree = "<group>"; };
DD865B632C3920F000C351A2 /* AppleLoginVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppleLoginVC.swift; sourceTree = "<group>"; };
DDA2EE722C385EB9007C6059 /* MainTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = "<group>"; };
DDA2EE742C385FB1007C6059 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
Expand All @@ -140,15 +152,15 @@
DE254AC12C311DC200A4015E /* Pretendard-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Light.otf"; sourceTree = "<group>"; };
DE254AC22C311DC200A4015E /* Pretendard-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Black.otf"; sourceTree = "<group>"; };
DE254AC32C311DC200A4015E /* Pretendard-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Thin.otf"; sourceTree = "<group>"; };
DE32D1D12C3BF703006848DF /* LoginUserResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginUserResponseModel.swift; sourceTree = "<group>"; };
DE32D1D32C3BFB56006848DF /* UpdateProfileNameModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateProfileNameModel.swift; sourceTree = "<group>"; };
DE8247FC2C36E7C7000601BC /* MoyaLoggingPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoyaLoggingPlugin.swift; sourceTree = "<group>"; };
DE8247FF2C36E857000601BC /* ObservablePattern.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObservablePattern.swift; sourceTree = "<group>"; };
DE9E187F2C3BA4AA00DB76B4 /* CustomButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomButton.swift; sourceTree = "<group>"; };
DE9E18832C3BA84500DB76B4 /* CustomTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTextField.swift; sourceTree = "<group>"; };
DE9E18882C3BC91000DB76B4 /* ResponseBodyDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseBodyDTO.swift; sourceTree = "<group>"; };
DE9E188A2C3BC92500DB76B4 /* EmptyModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyModel.swift; sourceTree = "<group>"; };
DE9E18912C3BCC9D00DB76B4 /* AuthTemp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthTemp.swift; sourceTree = "<group>"; };
DE9E18932C3BCCA300DB76B4 /* UsersTemp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UsersTemp.swift; sourceTree = "<group>"; };
DE9E18952C3BCCAC00DB76B4 /* MeetingsTemp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingsTemp.swift; sourceTree = "<group>"; };
DE9E18992C3BCCBE00DB76B4 /* UtilsTemp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UtilsTemp.swift; sourceTree = "<group>"; };
DED5DBEB2C345210006ECE7E /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
DED5DBED2C34529A006ECE7E /* BaseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -416,7 +428,8 @@
DE9E188C2C3BCC3E00DB76B4 /* Users */ = {
isa = PBXGroup;
children = (
DE9E18932C3BCCA300DB76B4 /* UsersTemp.swift */,
DE32D1D12C3BF703006848DF /* LoginUserResponseModel.swift */,
DE32D1D32C3BFB56006848DF /* UpdateProfileNameModel.swift */,
);
path = Users;
sourceTree = "<group>";
Expand All @@ -432,7 +445,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 = "<group>";
Expand Down Expand Up @@ -610,35 +628,41 @@
files = (
DED5DBF22C34534A006ECE7E /* BaseCollectionReusableView.swift in Sources */,
DED5DBEC2C345210006ECE7E /* BaseViewController.swift in Sources */,
DE9E18942C3BCCA300DB76B4 /* UsersTemp.swift in Sources */,
DD30721A2C3C011600416D9F /* AddPromiseRequestModel.swift in Sources */,
DD30721E2C3C0CC800416D9F /* PromiseInfoResponseModel.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 */,
DE254AB42C31199B00A4015E /* UITextField+.swift in Sources */,
DE8248002C36E857000601BC /* ObservablePattern.swift in Sources */,
DE254AAA2C31190E00A4015E /* UIStackView+.swift in Sources */,
DED5DBF02C345317006ECE7E /* BaseCollectionViewCell.swift in Sources */,
DE32D1D42C3BFB56006848DF /* UpdateProfileNameModel.swift in Sources */,
DE9E18922C3BCC9D00DB76B4 /* AuthTemp.swift in Sources */,
DE254AA82C3118EA00A4015E /* UIView+.swift in Sources */,
DE254AAE2C31193600A4015E /* UIFont+.swift in Sources */,
DE9E189A2C3BCCBE00DB76B4 /* UtilsTemp.swift in Sources */,
DD3072142C3BF87A00416D9F /* NearestPromiseResponseModel.swift in Sources */,
DE9E18962C3BCCAC00DB76B4 /* MeetingsTemp.swift in Sources */,
DD3072162C3BFE4E00416D9F /* UpcomingPromiseListResponseModel.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 */,
DD3072222C3C0DA300416D9F /* PromiseParticipantListResponseModel.swift in Sources */,
DE32D1D22C3BF703006848DF /* LoginUserResponseModel.swift in Sources */,
DE9E18892C3BC91000DB76B4 /* ResponseBodyDTO.swift in Sources */,
DD3072202C3C0D4500416D9F /* MyReadyStatusResponseModel.swift in Sources */,
DD3072282C3C104D00416D9F /* ArrivalCompletionResponseModel.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"originHash" : "e965e5bd1339de125bca61567185acfd41e7aa2dcfa1047d417a53865e4e70dc",
"pins" : [
{
"identity" : "abseil-cpp-binary",
Expand Down Expand Up @@ -199,5 +200,5 @@
}
}
],
"version" : 2
"version" : 3
}
8 changes: 0 additions & 8 deletions KkuMulKum/Network/DTO/Model/Auth/AuthTemp.swift

This file was deleted.

15 changes: 15 additions & 0 deletions KkuMulKum/Network/DTO/Model/Auth/ResissueResponseModel.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// ResissueResponseModel.swift
// KkuMulKum
//
// Created by 이지훈 on 7/8/24.
//

import Foundation


// MARK: - ReissueResponseModel

struct ReissueResponseModel: Codable {
let accessToken, refreshToken: String?
}
15 changes: 15 additions & 0 deletions KkuMulKum/Network/DTO/Model/Auth/SocialLoginRequestModel.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// AuthTemp.swift
// KkuMulKum
//
// Created by 김진웅 on 7/8/24.
//

import Foundation


// MARK: - SocialLoginRequestModel

struct SocialLoginRequestModel: Codable {
let provider: String?
}
15 changes: 15 additions & 0 deletions KkuMulKum/Network/DTO/Model/Auth/SocialLoginResponceModle.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// SocialLoginResponceModle.swift
// KkuMulKum
//
// Created by 이지훈 on 7/8/24.
//

import Foundation


// MARK: - SocialLoginResponseModel

struct SocialLoginResponseModel: Codable {
let name, accessToken, refreshToken: String?
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//
// MakeMeetingsRequestModel.swift
// KkuMulKum
//
// Created by 예삐 on 7/8/24.
//

import Foundation

struct MakeMeetingsRequestModel: Codable {
let name: String
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//
// MakeMeetingsResponseModel.swift
// KkuMulKum
//
// Created by 예삐 on 7/8/24.
//

import Foundation

struct MakeMeetingsResponseModel: Codable {
let invitationCode: String
}
Original file line number Diff line number Diff line change
@@ -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
}
Original file line number Diff line number Diff line change
@@ -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
}
Original file line number Diff line number Diff line change
@@ -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"
}
}
8 changes: 0 additions & 8 deletions KkuMulKum/Network/DTO/Model/Meetings/MeetingsTemp.swift

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//
// RegisterMeetingsResponseModel.swift
// KkuMulKum
//
// Created by 예삐 on 7/8/24.
//

import Foundation

struct RegisterMeetingsRequestModel: Codable {
let name: String
}
26 changes: 26 additions & 0 deletions KkuMulKum/Network/DTO/Model/Users/LoginUserResponseModel.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// LoginUserResponseModel.swift
// KkuMulKum
//
// Created by 김진웅 on 7/8/24.
//

import Foundation

struct LoginUserResponseModel: Codable {
let name: String
let level: Int
let promiseCount: Int
let tardyCount: Int
let tardySum: Int
let profileImageURL: String

enum CodingKeys: String, CodingKey {
case name
case level
case promiseCount
case tardyCount
case tardySum
case profileImageURL = "profileImg"
}
}
12 changes: 12 additions & 0 deletions KkuMulKum/Network/DTO/Model/Users/UpdateProfileNameModel.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//
// UpdateProfileNameModel.swift
// KkuMulKum
//
// Created by 김진웅 on 7/8/24.
//

import Foundation

struct UpdateProfileNameModel: Codable {
let name: String
}
8 changes: 0 additions & 8 deletions KkuMulKum/Network/DTO/Model/Users/UsersTemp.swift

This file was deleted.

0 comments on commit 3b9de14

Please sign in to comment.