Skip to content

Commit

Permalink
🎨[style]: μ˜€νƒˆμž μˆ˜μ • DDD-Community#40
Browse files Browse the repository at this point in the history
  • Loading branch information
honghoker committed Feb 4, 2025
1 parent a4f16d0 commit 469a8d4
Show file tree
Hide file tree
Showing 37 changed files with 379 additions and 383 deletions.
14 changes: 7 additions & 7 deletions Attendance/Projects/App/Sources/Domain/Model/Attendance.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public struct Attendance: Codable, Hashable {
var id: String?
var memberId: String?
var memberType: MemberType?
var manging: Managing?
var managing: Managing?
var memberTeam: ManagingTeam?
var name: String
var roleType: SelectPart
Expand All @@ -30,7 +30,7 @@ public struct Attendance: Codable, Hashable {
id: String,
memberId: String? = nil,
memberType: MemberType? = nil,
manging: Managing? = nil,
managing: Managing? = nil,
memberTeam: ManagingTeam? = nil,
name: String,
roleType: SelectPart,
Expand All @@ -43,7 +43,7 @@ public struct Attendance: Codable, Hashable {
self.id = id
self.memberId = memberId
self.memberType = memberType
self.manging = manging
self.managing = managing
self.memberTeam = memberTeam
self.name = name
self.roleType = roleType
Expand All @@ -57,15 +57,15 @@ public struct Attendance: Codable, Hashable {
enum CodingKeys: String, CodingKey {
case id, memberId, name, roleType, eventId
case createdAt, updatedAt, status, generation, memberType
case manging, memberTeam
case managing, memberTeam
}

public init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)
self.id = try container.decodeIfPresent(String.self, forKey: .id) ?? ""
self.memberId = try container.decodeIfPresent(String.self, forKey: .memberId) ?? ""
self.memberType = try container.decodeIfPresent(MemberType.self, forKey: .memberType) ?? .coreMember
self.manging = try container.decodeIfPresent(Managing.self, forKey: .manging) ?? .notManging
self.managing = try container.decodeIfPresent(Managing.self, forKey: .managing) ?? .notManaging
self.memberTeam = try container.decodeIfPresent(ManagingTeam.self, forKey: .memberTeam) ?? .notTeam
self.name = try container.decodeIfPresent(String.self, forKey: .name) ?? ""
self.roleType = try container.decodeIfPresent(SelectPart.self, forKey: .roleType) ?? .all
Expand All @@ -81,7 +81,7 @@ public struct Attendance: Codable, Hashable {
self.id = document.documentID
self.memberId = data["memberId"] as? String ?? ""
self.memberType = MemberType(rawValue: data["memberType"] as? String ?? "") ?? .coreMember
self.manging = Managing(rawValue: data["manging"] as? String ?? "") ?? .notManging
self.managing = Managing(rawValue: data["managing"] as? String ?? "") ?? .notManaging
self.memberTeam = ManagingTeam(rawValue: data["memberTeam"] as? String ?? "") ?? .notTeam
self.name = data["name"] as? String ?? ""
self.roleType = SelectPart(rawValue: data["roleType"] as? String ?? "") ?? .all
Expand Down Expand Up @@ -173,7 +173,7 @@ extension Attendance {
return MemberDTO(
memberId: self.memberId ?? "",
memberType: self.memberType ?? .coreMember,
manging: self.manging ?? .notManging,
managing: self.managing ?? .notManaging,
memberTeam: self.memberTeam ?? .notTeam,
name: self.name,
roleType: self.roleType,
Expand Down
16 changes: 8 additions & 8 deletions Attendance/Projects/App/Sources/Domain/Model/Managing.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Manging.swift
// Managing.swift
// DDDAttendance
//
// Created by μ„œμ›μ§€ on 7/19/24.
Expand All @@ -13,21 +13,21 @@ public enum Managing: String, CaseIterable, Codable {
case scheduleManagement = "Schedule_Management"
case instagramManagement = "Instagram_Management"
case attendanceCheck = "Attendance_Check"
case projectTeamManging = "Project_TeamManging"
case notManging = "NotManging"
case projectTeamManaging = "Project_TeamManaging"
case notManaging = "NotManaging"

public init(from decoder: Decoder) throws {
let container = try decoder.singleValueContainer()
let rawValue = try container.decode(String.self)

if rawValue.trimmingCharacters(in: .whitespaces).isEmpty {
self = .notManging
self = .notManaging
} else {
self = Managing(rawValue: rawValue) ?? .notManging
self = Managing(rawValue: rawValue) ?? .notManaging
}
}

var mangingDesc: String {
var managingDesc: String {
switch self {
case .accountiConsulting:
return "νšŒκ³„, MC"
Expand All @@ -39,9 +39,9 @@ public enum Managing: String, CaseIterable, Codable {
return "μΈμŠ€νƒ€κ·Έλž¨"
case .attendanceCheck:
return "μΆœμ„ 체크"
case .projectTeamManging:
case .projectTeamManaging:
return "νŒ€λ§€λ‹ˆμ§•"
case .notManging:
case .notManaging:
return ""
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// MangingTeam.swift
// ManagingTeam.swift
// DDDAttendance
//
// Created by μ„œμ›μ§€ on 7/19/24.
Expand All @@ -26,7 +26,7 @@ public enum ManagingTeam: String, CaseIterable, Codable {
}
}

var mangingTeamDesc: String {
var managingTeamDesc: String {
switch self {
case .ios1:
return "iOS 1"
Expand Down
2 changes: 1 addition & 1 deletion Attendance/Projects/App/Sources/Domain/Model/Member.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct Member: Codable, Hashable {
var name: String
var role: SelectPart
var memberType: MemberType
var manging: Managing?
var managing: Managing?
var memberTeam: ManagingTeam?
var snsURL: String?
var createdAt: Date
Expand Down
10 changes: 5 additions & 5 deletions Attendance/Projects/App/Sources/Domain/Model/MemberDTO.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Model
public struct MemberDTO: Codable, Equatable {
var memberId: String
var memberType: MemberType
var manging: Managing
var managing: Managing
var memberTeam: ManagingTeam
var name: String
var roleType: SelectPart
Expand All @@ -25,7 +25,7 @@ public struct MemberDTO: Codable, Equatable {
init(
memberId: String,
memberType: MemberType = .coreMember,
manging: Managing = .notManging,
managing: Managing = .notManaging,
memberTeam: ManagingTeam = .notTeam,
name: String,
roleType: SelectPart = .all,
Expand All @@ -36,7 +36,7 @@ public struct MemberDTO: Codable, Equatable {
) {
self.memberId = memberId
self.memberType = memberType
self.manging = manging
self.managing = managing
self.memberTeam = memberTeam
self.name = name
self.roleType = roleType
Expand Down Expand Up @@ -71,7 +71,7 @@ extension MemberDTO {
MemberDTO(
memberId: generateCustomMemberId(),
memberType: .member,
manging: .projectTeamManging,
managing: .projectTeamManaging,
memberTeam: .ios1,
name: "DDD iOS",
roleType: .iOS,
Expand All @@ -83,7 +83,7 @@ extension MemberDTO {
MemberDTO(
memberId: generateCustomMemberId(),
memberType: .member,
manging: .instagramManagement,
managing: .instagramManagement,
memberTeam: .notTeam,
name: "DDD Android",
roleType: .android,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ final class FirebaseService {
let createdAt: Date = data?["createdAt"] as? Date ?? Date()
let updatedAt: Date = data?["updatedAt"] as? Date ?? Date()
let generation: Int = data?["generation"] as? Int ?? 0
let manging: String = data?["manging"] as? String ?? ""
let managing: String = data?["managing"] as? String ?? ""
let memberTeam: String = data?["memberTeam"] as? String ?? ""
let member: Member = .init(
uid: uid,
memberid: uid,
name: name,
role: SelectPart(rawValue: roleType) ?? .iOS,
memberType: MemberType(rawValue: memberType) ?? .notYet,
manging: Managing(rawValue: manging) ?? .notManging,
managing: Managing(rawValue: managing) ?? .notManaging,
memberTeam: ManagingTeam(rawValue: memberTeam) ?? .notTeam,
createdAt: createdAt,
updatedAt: updatedAt,
Expand All @@ -116,7 +116,7 @@ final class FirebaseService {
"memberId" : member.memberid,
"roleType": member.role.desc,
"memberType": member.memberType.rawValue,
"manging": member.manging?.rawValue ?? "",
"managing": member.managing?.rawValue ?? "",
"memberTeam": member.memberTeam?.rawValue ?? "",
"createdAt": member.createdAt,
"updatedAt": member.updatedAt,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public struct Attendance: Codable, Hashable {
public var id: String?
public var memberId: String?
public var memberType: MemberType?
public var manging: Managing?
public var managing: Managing?
public var memberTeam: SelectTeam?
public var name: String
public var roleType: SelectPart
Expand All @@ -27,7 +27,7 @@ public struct Attendance: Codable, Hashable {
id: String,
memberId: String? = nil,
memberType: MemberType? = nil,
manging: Managing? = nil,
managing: Managing? = nil,
memberTeam: SelectTeam? = nil,
name: String,
roleType: SelectPart,
Expand All @@ -40,7 +40,7 @@ public struct Attendance: Codable, Hashable {
self.id = id
self.memberId = memberId
self.memberType = memberType
self.manging = manging
self.managing = managing
self.memberTeam = memberTeam
self.name = name
self.roleType = roleType
Expand All @@ -54,15 +54,15 @@ public struct Attendance: Codable, Hashable {
enum CodingKeys: String, CodingKey {
case id, memberId, name, roleType, eventId
case createdAt, updatedAt, status, generation, memberType
case manging, memberTeam
case managing, memberTeam
}

public init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)
self.id = try container.decodeIfPresent(String.self, forKey: .id) ?? ""
self.memberId = try container.decodeIfPresent(String.self, forKey: .memberId) ?? ""
self.memberType = try container.decodeIfPresent(MemberType.self, forKey: .memberType) ?? .coreMember
self.manging = try container.decodeIfPresent(Managing.self, forKey: .manging) ?? .notManging
self.managing = try container.decodeIfPresent(Managing.self, forKey: .managing) ?? .notManaging
self.memberTeam = try container.decodeIfPresent(SelectTeam.self, forKey: .memberTeam) ?? .notTeam
self.name = try container.decodeIfPresent(String.self, forKey: .name) ?? ""
self.roleType = try container.decodeIfPresent(SelectPart.self, forKey: .roleType) ?? .all
Expand All @@ -78,7 +78,7 @@ public struct Attendance: Codable, Hashable {
self.id = document.documentID
self.memberId = data["memberId"] as? String ?? ""
self.memberType = MemberType(rawValue: data["memberType"] as? String ?? "") ?? .coreMember
self.manging = Managing(rawValue: data["manging"] as? String ?? "") ?? .notManging
self.managing = Managing(rawValue: data["managing"] as? String ?? "") ?? .notManaging
self.memberTeam = SelectTeam(rawValue: data["memberTeam"] as? String ?? "") ?? .notTeam
self.name = data["name"] as? String ?? ""
self.roleType = SelectPart(rawValue: data["roleType"] as? String ?? "") ?? .all
Expand Down Expand Up @@ -169,7 +169,7 @@ public extension Attendance {
return MemberDTO(
memberId: self.memberId ?? "",
memberType: self.memberType ?? .coreMember,
manging: self.manging ?? .notManging,
managing: self.managing ?? .notManaging,
memberTeam: self.memberTeam ?? .notTeam,
name: self.name,
roleType: self.roleType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
public struct MemberDTO: Codable, Equatable {
public var memberId: String
public var memberType: MemberType
public var manging: Managing
public var managing: Managing
public var memberTeam: SelectTeam
public var name: String
public var roleType: SelectPart
Expand All @@ -22,7 +22,7 @@ public struct MemberDTO: Codable, Equatable {
public init(
memberId: String,
memberType: MemberType = .coreMember,
manging: Managing = .notManging,
managing: Managing = .notManaging,
memberTeam: SelectTeam = .notTeam,
name: String,
roleType: SelectPart = .all,
Expand All @@ -33,7 +33,7 @@ public struct MemberDTO: Codable, Equatable {
) {
self.memberId = memberId
self.memberType = memberType
self.manging = manging
self.managing = managing
self.memberTeam = memberTeam
self.name = name
self.roleType = roleType
Expand Down Expand Up @@ -68,7 +68,7 @@ extension MemberDTO {
MemberDTO(
memberId: generateCustomMemberId(),
memberType: .member,
manging: .projectTeamManging,
managing: .projectTeamManaging,
memberTeam: .ios1,
name: "DDD iOS",
roleType: .iOS,
Expand All @@ -80,7 +80,7 @@ extension MemberDTO {
MemberDTO(
memberId: generateCustomMemberId(),
memberType: .member,
manging: .snsManagement,
managing: .snsManagement,
memberTeam: .notTeam,
name: "DDD Android",
roleType: .android,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public struct CoreMemberDTOSignUp: Codable, Equatable {
public var email: String
public var role: SelectPart
public var memberType: MemberType
public var manging: Managing
public var managing: Managing
public var isAdmin: Bool
/// 기수
public var generation: Int
Expand All @@ -26,7 +26,7 @@ public struct CoreMemberDTOSignUp: Codable, Equatable {
name: String,
role: SelectPart,
memberType: MemberType,
manging: Managing,
managing: Managing,
isAdmin: Bool,
generation: Int
) {
Expand All @@ -36,7 +36,7 @@ public struct CoreMemberDTOSignUp: Codable, Equatable {
self.name = name
self.role = role
self.memberType = memberType
self.manging = manging
self.managing = managing
self.isAdmin = isAdmin
self.generation = generation
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public extension Member {
name: self.name,
role: self.role ?? .all,
memberType: self.memberType,
manging: self.manging ?? .notManging,
managing: self.managing ?? .notManaging,
isAdmin: self.isAdmin,
generation: self.generation
)
Expand All @@ -60,7 +60,7 @@ public extension Member {
"name": name,
"role": role?.rawValue ?? "",
"memberType": memberType.rawValue,
"manging": manging?.rawValue ?? "",
"managing": managing?.rawValue ?? "",
"isAdmin": isAdmin ,
"createdAt": createdAt,
"updatedAt": updatedAt,
Expand All @@ -76,7 +76,7 @@ public extension Member {
email: self.email,
role: self.role ?? .all,
memberType: self.memberType,
manging: self.manging ?? .notManging,
managing: self.managing ?? .notManaging,
memberTeam: self.memberTeam ?? .notTeam,
isAdmin: self.isAdmin,
generation: self.generation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public struct Member: Codable, Hashable, Equatable {
public var name: String
public var role: SelectPart?
public var memberType: MemberType
public var manging: Managing?
public var managing: Managing?
public var memberTeam: SelectTeam?
public var snsURL: String
public var createdAt: Date
Expand All @@ -32,7 +32,7 @@ public struct Member: Codable, Hashable, Equatable {
name: String = "",
role: SelectPart? = .all,
memberType: MemberType = .notYet,
manging: Managing? = nil,
managing: Managing? = nil,
memberTeam: SelectTeam? = nil,
snsURL: String? = nil,
createdAt: Date = .now,
Expand All @@ -46,7 +46,7 @@ public struct Member: Codable, Hashable, Equatable {
self.name = name
self.role = role
self.memberType = memberType
self.manging = manging
self.managing = managing
self.memberTeam = memberTeam
self.snsURL = snsURL ?? ""
self.createdAt = createdAt
Expand Down
Loading

0 comments on commit 469a8d4

Please sign in to comment.