1.1.0 릴리즈

.github/workflows/qappleRepoCI.yml

@@ -0,0 +1,33 @@
+# This workflow will build a Swift project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
+
+name: Package Test
+
+on:
+  push:
+    branches:
+      - develop
+      - main
+  pull_request:
+    branches: 
+      - develop
+      - main
+
+jobs:
+  test:
+    runs-on: macos-latest
+
+    steps:
+    - name: Branch Checkout ✔
+      uses: actions/checkout@v4
+
+    - name: Setup Swift 🦉
+      uses: swift-actions/setup-swift@v2.2.0
+      with:
+        swift-version: "6"
+
+    - name: Build 💻
+      run: swift build -v
+
+    - name: Test 🧪
+      run: TEST_URL=${{secrets.TEST_URL}} PRODUCTION_URL=${{secrets.PRODUCTION_URL}} PORT_NUM=${{secrets.PORT_NUM}} CERT_CODE=${{secrets.CERT_CODE}} swift test -v 

.github/workflows/release.yml

@@ -0,0 +1,28 @@
+name: Release Tag 🏷️
+
+on:
+  push:
+    branches:
+      - main
+
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Branch Checkout
+      uses: actions/checkout@v4
+
+    - name: 버전 정보 추출
+      run: echo "##[set-output name=version;]$(echo '${{ github.event.head_commit.message }}' | egrap -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')"
+      id: extract_version_name
+
+    - name: Release & Tag 생성 🏎️
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      with:
+        tag_name: ${{steps.extract_version_name.outputs.version}}
+        release_name: ${{steps.extract_version_name.outputs.version}}
+        body: ${{github.event.pull_request.body}}

Sources/QappleRepository/API/API.swift

@@ -52,10 +52,10 @@ extension RawRepresentable where RawValue == String, Self: API {
         let baseURLString = try BaseURL.fetch(from: server)
         guard let baseURL = URL(string: baseURLString)?
             .appendingPathComponent(Self.basePath) else {
-            throw APIError.invalidBaseUrl("BaseURL Error: \(baseURLString)")
+            throw RepositoryError.invalidBaseUrl("BaseURL Error: \(baseURLString)")
         }
         guard let url = URL(string: baseURL.absoluteString + rawValue) else {
-            throw APIError.invalidBaseUrl("RawValue Error: \(rawValue)")
+            throw RepositoryError.invalidBaseUrl("RawValue Error: \(rawValue)")
         }
         return url
     }

Sources/QappleRepository/API/BaseURL.swift

@@ -25,18 +25,18 @@ enum BaseURL {
     static func fetch(from server: Server) throws -> String {
         if Bundle.main == Bundle(for: PackageClass.self) {
             guard let host = Bundle.main.infoDictionary?[serverKey(server)] as? String else {
-                throw APIError.invalidSecretKey("HOST_URL_\(server.rawValue.uppercased())")
+                throw RepositoryError.invalidSecretKey("HOST_URL_\(server.rawValue.uppercased())")
             }
             guard let port = Bundle.main.infoDictionary?["PORT_NUM"] as? String else {
-                throw APIError.invalidSecretKey("PORT_NUM")
+                throw RepositoryError.invalidSecretKey("PORT_NUM")
             }
             return "\(scheme)://\(host):\(port)"
         } else {
             guard let host = ProcessInfo.processInfo.environment[serverKey(server)] else {
-                throw APIError.invalidSecretKey("HOST_URL_\(server.rawValue.uppercased())")
+                throw RepositoryError.invalidSecretKey("HOST_URL_\(server.rawValue.uppercased())")
             }
             guard let port = ProcessInfo.processInfo.environment["PORT_NUM"] else {
-                throw APIError.invalidSecretKey("PORT_NUM")
+                throw RepositoryError.invalidSecretKey("PORT_NUM")
             }
             return "\(scheme)://\(host):\(port)"
         }

Sources/QappleRepository/API/QappleAPI.swift

@@ -91,6 +91,12 @@ enum QappleAPI {
         /// 회원가입
         case signUp
 
+        /// 사용자 자격 변경
+        case roleChange(role: String)
+
+        /// 메일 인증 화이트 리스트 등록
+        case emailWhitelist(mail: String, whitelistDurationMinutes: Int64)
+
         var rawValue: RawValue {
             switch self {
             case let .certification(signUpToken, email):
@@ -139,9 +145,19 @@ enum QappleAPI {
 
             case .signUp:
                 appending(baseString: "sign-up")
+
+            case let .roleChange(role):
+                appending(baseString: "role/change", urlQueryItems: [
+                    .init(key: "role", value: role)
+                ])
+
+            case let .emailWhitelist(mail, whitelistDurationMinutes):
+                appending(baseString: "email/whitelist/register", urlQueryItems: [
+                    .init(key: "mail", value: mail),
+                    .init(key: "whitelistDurationMinutes", value: whitelistDurationMinutes)
+                ])
             }
         }
-
     }
 
     // MARK: - Board

Sources/QappleRepository/DTO/Answer/AnswerListOfMine.swift

@@ -20,6 +20,7 @@ public struct AnswerListOfMine: Decodable, Sendable {
         public let answerId: Int
         public let writerId: Int
         public let nickname: String
+        public let writerGeneration: String
         public let profileImage: String?
         public let content: String
         public let heartCount: Int

Sources/QappleRepository/DTO/Answer/AnswerListOfQuestion.swift

@@ -20,6 +20,7 @@ public struct AnswerListOfQuestion: Decodable, Sendable {
         public let writerId: Int
         public let profileImage: String?
         public let nickname: String
+        public let writerGeneration: String
         public let content: String
         public let isMine: Bool
         public let isReported: Bool

Sources/QappleRepository/DTO/Board/BoardList.swift

@@ -19,6 +19,7 @@ public struct BoardList: Decodable, Sendable {
         public let boardId: Int
         public let writerId: Int
         public let writerNickname: String
+        public let writerGeneration: String
         public let content: String
         public let heartCount: Int
         public let commentCount: Int

Sources/QappleRepository/DTO/Board/SearchBoard.swift

@@ -19,6 +19,7 @@ public struct SearchBoard: Decodable, Sendable {
         public let boardId: Int
         public let writerId: Int
         public let writerNickname: String
+        public let writerGeneration: String
         public let content: String
         public let heartCount: Int
         public let commentCount: Int

Sources/QappleRepository/DTO/Board/SingleBoard.swift

@@ -11,6 +11,7 @@ public struct SingleBoard: Decodable, Sendable {
     public let boardId: Int
     public let writerId: Int
     public let writerNickname: String
+    public let writerGeneration: String
     public let content: String
     public let heartCount: Int
     public let commentCount: Int

Sources/QappleRepository/DTO/BoardComment/BoardCommentList.swift

@@ -18,6 +18,7 @@ public struct BoardCommentList: Decodable, Sendable {
     public struct Content: Decodable, Sendable {
         public let boardCommentId: Int
         public let writerId: Int
+        public let writerGeneration: String
         public let content: String
         public let heartCount: Int
         public let isLiked: Bool

Sources/QappleRepository/DTO/Member/RoleChange.swift

@@ -0,0 +1,13 @@
+//
+//  RoleChange.swift
+//  QappleRepository
+//
+//  Created by Simmons on 2/12/25.
+//
+
+import Foundation
+
+public struct RoleChange: Decodable, Sendable {
+    public let accessToken: String
+    public let refreshToken: String
+}

Sources/QappleRepository/DTO/Notification/NotificationList.swift

@@ -21,7 +21,9 @@ public struct NotificationList: Decodable, Sendable {
         public let subtitle: String?
         public let content: String?
         public let boardId: String?
+        public let isReportedBoard: Bool?
         public let questionId: String?
+        public let isResponsedQuestion: Bool?
         public let boardCommentId: String?
         public let createdAt: String
     }

Sources/QappleRepository/Entity/MemberRole.swift

@@ -0,0 +1,13 @@
+//
+//  MemberRole.swift
+//  QappleRepository
+//
+//  Created by 김민준 on 3/1/25.
+//
+
+import Foundation
+
+public enum MemberRole: String, Sendable {
+    case academier = "ROLE_ACADEMIER"
+    case admin = "ROLE_ADMIN"
+}

Sources/QappleRepository/Entity/RepositoryError.swift

@@ -0,0 +1,58 @@
+//
+//  RepositoryError.swift
+//  Qapple-Repository
+//
+//  Created by 김민준 on 2/9/25.
+//
+
+import Foundation
+
+/// Repository에서 발생할 수 있는 에러를 정의합니다.
+public enum RepositoryError: Error, Sendable {
+
+    /// 유효하지 않은 SecretKey 에러
+    case invalidSecretKey(String)
+
+    /// 기본 URL 에러
+    case invalidBaseUrl(String)
+
+    /// URLReuqest 함수 호출에 실패했습니다.
+    case urlRequestFailure(urlString: String)
+
+    /// 유효하지 않은 Response입니다.
+    case invalidResponse(urlString: String, statusCode: Int, message: String)
+
+    /// 인증에 실패했습니다.(403 에러)
+    case authenticationFailed
+
+    /// Decoding에 실패했습니다.
+    case decodingFailure(type: Decodable.Type)
+
+    /// 실패 Response
+    struct FailedResponse: Decodable {
+        let message: String
+    }
+}
+
+// MARK: - LocalizedError
+
+extension RepositoryError: LocalizedError {
+
+    /// 에러 메시지
+    public var errorDescription: String? {
+        switch self {
+        case let .invalidSecretKey(string):
+            NSLocalizedString("\(string) 설정 오류", comment: "invalidSecretKey")
+        case .invalidBaseUrl:
+            NSLocalizedString("BaseURL 설정 오류", comment: "invalidBaseUrl")
+        case .urlRequestFailure:
+            NSLocalizedString("네트워크 요청 실패", comment: "urlRequestFailure")
+        case let .invalidResponse(_, statusCode, message):
+            NSLocalizedString("잘못된 네트워크 응답: \(statusCode) + \(message)", comment: "invalidResponse")
+        case .authenticationFailed:
+            NSLocalizedString("액세스 토큰 만료: 403", comment: "authenticationFailed")
+        case let .decodingFailure(type):
+            NSLocalizedString("디코딩 실패: \(type)", comment: "decodingFailure")
+        }
+    }
+}

Sources/QappleRepository/NetworkService/NetworkService.swift

@@ -80,7 +80,7 @@ extension NetworkService {
 
             return try await URLSession.shared.data(for: request)
         } catch {
-            throw NetworkError.urlRequestFailure(urlString: url.absoluteString)
+            throw RepositoryError.urlRequestFailure(urlString: url.absoluteString)
         }
     }
 
@@ -127,13 +127,13 @@ extension NetworkService {
         let successStatusCodeRange = 200...299
         guard successStatusCodeRange.contains(statusCode) else {
             if statusCode == 403 {
-                throw NetworkError.authenticationFailed
+                throw RepositoryError.authenticationFailed
             } else {
                 let failedResponse = try? decoder.decode(
-                    NetworkError.FailedResponse.self,
+                    RepositoryError.FailedResponse.self,
                     from: data
                 )
-                throw NetworkError.invalidResponse(
+                throw RepositoryError.invalidResponse(
                     urlString: response.url?.absoluteString ?? "",
                     statusCode: statusCode,
                     message: failedResponse?.message ?? "에러 메시지 없음"
@@ -156,7 +156,7 @@ extension NetworkService {
             )
             return decodedData.result
         } catch {
-            throw NetworkError.decodingFailure(type: T.self)
+            throw RepositoryError.decodingFailure(type: T.self)
         }
     }
 }