Merge pull request #287 from Team-return/feature/(#286)-notice_file_download

🔗 :: (#286) 모집의뢰서 버그 수정

Author: leejh08

Projects/Data/Sources/DTO/Recruitments/RecruitmentDetailResponseDTO.swift

@@ -4,7 +4,7 @@ import Domain
 struct RecruitmentDetailResponseDTO: Decodable {
     let recruitmentID: Int
     let companyID: Int
-    let companyProfileURL: String
+    let companyProfileURL: String?
     let companyName: String
     let areas: [AreaResponseDTO]
     let additionalQualifications: String?
@@ -27,7 +27,7 @@ struct RecruitmentDetailResponseDTO: Decodable {
     init(
         recruitmentID: Int,
         companyID: Int,
-        companyProfileURL: String,
+        companyProfileURL: String?,
         companyName: String,
         areas: [AreaResponseDTO],
         additionalQualifications: String?,
@@ -50,7 +50,7 @@ struct RecruitmentDetailResponseDTO: Decodable {
     ) {
         self.recruitmentID = recruitmentID
         self.companyID = companyID
-        self.companyProfileURL = companyProfileURL
+        self.companyProfileURL = companyProfileURL ?? ""
         self.companyName = companyName
         self.areas = areas
         self.additionalQualifications = additionalQualifications
@@ -107,7 +107,7 @@ extension RecruitmentDetailResponseDTO {
         return RecruitmentDetailEntity(
             recruitmentID: recruitmentID,
             companyID: companyID,
-            companyProfileURL: companyProfileURL,
+            companyProfileURL: companyProfileURL ?? "",
             companyName: companyName,
             areas: areas.map { $0.toDomain() },
             additionalQualifications: additionalQualifications,

Projects/Data/Sources/DTO/Recruitments/RecruitmentListResponseDTO.swift

@@ -7,7 +7,7 @@ struct RecruitmentListResponseDTO: Decodable {
 struct RecruitmentResponseDTO: Codable {
     let recruitID: Int
     let companyName: String
-    let companyProfileURL: String
+    let companyProfileURL: String?
     let trainPay: Int?
     let militarySupport: Bool?
     let hiringJobs: String
@@ -30,7 +30,7 @@ extension RecruitmentListResponseDTO {
             RecruitmentEntity(
                 recruitID: $0.recruitID,
                 companyName: $0.companyName,
-                companyProfileURL: $0.companyProfileURL,
+                companyProfileURL: $0.companyProfileURL ?? "",
                 trainPay: $0.trainPay ?? 0,
                 militarySupport: $0.militarySupport ?? false,
                 hiringJobs: $0.hiringJobs,

Projects/Domain/Sources/Entities/Studetns/StudentInfoEntity.swift renamed to Projects/Domain/Sources/Entities/Students/StudentInfoEntity.swift

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "download.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Download.imageset/Contents.json

@@ -44,6 +44,7 @@ public enum JobisIcon {
     case close
     case addPhoto
     case fileImage
+    case download
 
     func uiImage() -> UIImage {
         let dsIcons = DesignSystemAsset.Icons.self
@@ -156,6 +157,9 @@ public enum JobisIcon {
 
         case .fileImage:
             return dsIcons.fileImage.image
+
+        case .download:
+            return dsIcons.download.image
         }
     }
 }

Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/Download.imageset/download.svg

@@ -25,13 +25,23 @@ public final class NoticeDetailViewController: BaseViewController<NoticeDetailVi
         $0.numberOfLines = 0
         $0.lineBreakMode = .byWordWrapping
     }
+//    private let attachmentLabel = UILabel().then {
+//        $0.setJobisText(
+//            "첨부파일",
+//            font: .largeBody,
+//            color: .GrayScale.gray60
+//        )
+//        $0.isHidden = true
+//    }
+
     public override func addView() {
         view.addSubview(scrollView)
         scrollView.addSubview(contentView)
         [
             noticeTitleLabel,
             noticeDateLabel,
             noticeContentLabel
+//            attachmentLabel
         ].forEach(contentView.addSubview(_:))
     }
 
@@ -59,6 +69,11 @@ public final class NoticeDetailViewController: BaseViewController<NoticeDetailVi
             $0.top.equalTo(noticeDateLabel.snp.bottom).offset(16)
             $0.left.right.equalToSuperview().inset(24)
         }
+
+//        attachmentLabel.snp.makeConstraints {
+//            $0.top.equalTo(noticeContentLabel.snp.bottom).offset(16)
+//            $0.leading.equalToSuperview().inset(24)
+//        }
     }
 
     public override func bind() {
@@ -68,16 +83,17 @@ public final class NoticeDetailViewController: BaseViewController<NoticeDetailVi
 
         let output = viewModel.transform(input)
 
-        output.noticeDetailInfo.asObservable()
-            .bind(onNext: { [self] in
-                noticeTitleLabel.text = $0.title
-                noticeDateLabel.setJobisText(
+        output.noticeDetailInfo
+            .bind { [weak self] in
+                self?.noticeTitleLabel.text = $0.title
+                self?.noticeDateLabel.setJobisText(
                     $0.createdAt,
                     font: .description,
                     color: .GrayScale.gray60
                 )
-                noticeContentLabel.text = $0.content
-            })
+                self?.noticeContentLabel.text = $0.content
+//                self?.attachmentLabel.isHidden = $0.attachments.isEmpty
+            }
             .disposed(by: disposeBag)
     }
 

Projects/Modules/DesignSystem/Sources/Image/JobisIcon.swift

@@ -144,7 +144,7 @@ public final class NotificationSettingViewModel: BaseViewModel, Stepper {
             .flatMap { _ in
                 self.subscribeNotificationUseCase.execute(
                     token: Messaging.messaging().fcmToken ?? "",
-                    notificationType: .application
+                    notificationType: .winterIntern
                 )
             }
             .subscribe()