🧩 :: 관심분야 cell 추가

leejh08 · leejh08 · commit 9f273f80c7f0 · 2025-06-12T22:06:50.000+09:00
diff --git a/Projects/Presentation/Sources/InterestField/Components/Cell/MajorCollectionViewCell.swift b/Projects/Presentation/Sources/InterestField/Components/Cell/MajorCollectionViewCell.swift
@@ -3,8 +3,10 @@ import Domain
 import DesignSystem
 import SnapKit
 import Then
+import RxSwift
+import RxCocoa
 
-final class MajorCollectionViewCell: BaseCollectionViewCell<InterestsEntity> {
+final class MajorCollectionViewCell: BaseCollectionViewCell<CodeEntity> {
     static let identifier = "MajorCollectionViewCell"
 
     public var isCheck: Bool = false {
@@ -18,41 +20,56 @@ final class MajorCollectionViewCell: BaseCollectionViewCell<InterestsEntity> {
         }
     }
 
-    private let majorLabel = UILabel().then {
-        $0.textAlignment = .center
-        $0.font = UIFont.jobisFont(.body)
-        $0.numberOfLines = 1
-        $0.adjustsFontSizeToFitWidth = true
-        $0.minimumScaleFactor = 0.8
-        $0.setContentHuggingPriority(.required, for: .horizontal)
-        $0.setContentCompressionResistancePriority(.required, for: .horizontal)
-    }
+    private var disposeBag = DisposeBag()
+    private let majorLabel = UILabel()
 
     override func addView() {
         self.contentView.addSubview(majorLabel)
     }
 
     override func setLayout() {
         majorLabel.snp.makeConstraints {
-            $0.top.bottom.equalToSuperview().inset(6)
-            $0.center.equalToSuperview()
-            $0.leading.greaterThanOrEqualToSuperview().offset(16)
-            $0.trailing.lessThanOrEqualToSuperview().offset(-16)
+            $0.centerY.equalToSuperview()
+            $0.leading.trailing.equalToSuperview().inset(16)
+            $0.height.equalTo(31)
         }
     }
 
     override func configureView() {
         self.backgroundColor = .GrayScale.gray30
-        self.layer.cornerRadius = 18
+        self.layer.cornerRadius = 15.5
         self.layer.masksToBounds = true
+        majorLabel.textAlignment = .center
+        majorLabel.font = UIFont.jobisFont(.body)
+        majorLabel.numberOfLines = 1
+        majorLabel.lineBreakMode = .byClipping
+        majorLabel.adjustsFontSizeToFitWidth = false
     }
 
-    override func adapt(model: InterestsEntity) {
+    override func adapt(model: CodeEntity) {
         super.adapt(model: model)
-        majorLabel.setJobisText(
-            model.keyword,
-            font: .body,
-            color: .Primary.blue40
+        majorLabel.setJobisText(model.keyword, font: .body, color: .Primary.blue40)
+        invalidateIntrinsicContentSize()
+    }
+
+    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
+        let targetSize = CGSize(width: CGFloat.greatestFiniteMagnitude, height: 31)
+        let fittingSize = contentView.systemLayoutSizeFitting(
+            targetSize,
+            withHorizontalFittingPriority: .fittingSizeLevel,
+            verticalFittingPriority: .required
         )
+
+        let minWidth: CGFloat = 60
+        let width = max(fittingSize.width, minWidth)
+
+        layoutAttributes.frame.size = CGSize(width: width, height: 31)
+        return layoutAttributes
+    }
+    
+    override var intrinsicContentSize: CGSize {
+        let labelSize = majorLabel.intrinsicContentSize
+        let width = labelSize.width + 32
+        return CGSize(width: width, height: 31)
     }
 }
diff --git a/Projects/Presentation/Sources/InterestField/InterestFieldViewController.swift b/Projects/Presentation/Sources/InterestField/InterestFieldViewController.swift
@@ -8,7 +8,10 @@ import DesignSystem
 import Domain
 
 public final class InterestFieldViewController: BaseViewController<InterestFieldViewModel> {
-    private let viewAppearRelay = PublishRelay<Void>()
+    private let selectedIndexesRelay = BehaviorRelay<Set<IndexPath>>(value: [])
+    private let interestsRelay = BehaviorRelay<[CodeEntity]>(value: [])
+    private let selectedInterestsRelay = BehaviorRelay<[CodeEntity]>(value: [])
+    
     private let interestFieldTitleLabel = UILabel().then {
         $0.setJobisText(
             "님의\n관심사를 선택해주세요",
@@ -26,7 +29,25 @@ public final class InterestFieldViewController: BaseViewController<InterestField
         )
     }
 
-    private let majorCollectionView = InterestFieldCollectionView()
+    private let layout = AlignedCollectionViewFlowLayout().then {
+        $0.minimumLineSpacing = 8
+        $0.minimumInteritemSpacing = 8
+        $0.scrollDirection = .vertical
+        $0.estimatedItemSize = CGSize(width: 100, height: 31)
+        $0.sectionInset = .zero
+    }
+
+    private lazy var majorCollectionView = UICollectionView(
+        frame: .zero,
+        collectionViewLayout: layout
+    ).then {
+        $0.backgroundColor = .clear
+        $0.isScrollEnabled = false
+        $0.register(
+            MajorCollectionViewCell.self,
+            forCellWithReuseIdentifier: MajorCollectionViewCell.identifier
+        )
+    }
 
     private let selectButton = JobisButton(style: .main).then {
         $0.setText("관심 분야를 선택해 주세요!")
@@ -57,45 +78,56 @@ public final class InterestFieldViewController: BaseViewController<InterestField
             $0.bottom.equalTo(selectButton.snp.top).offset(-24)
         }
         selectButton.snp.makeConstraints {
-            $0.bottom.equalTo(self.view.safeAreaLayoutGuide.snp.bottom).inset(12)
+            $0.bottom.equalTo(view.safeAreaLayoutGuide.snp.bottom).inset(12)
             $0.leading.trailing.equalToSuperview().inset(24)
         }
     }
 
-    public override func configureNavigation() {
-        setSmallTitle(title: "관심사 설정")
-        self.navigationItem.largeTitleDisplayMode = .never
-        self.hideTabbar()
-    }
-
     public override func bind() {
         let input = InterestFieldViewModel.Input(
-            viewAppear: viewAppearRelay,
+            viewAppear: viewWillAppearPublisher,
             selectButtonDidTap: selectButton.rx.tap.asSignal(),
-            selectedInterests: majorCollectionView.selectedInterests
+            selectedInterests: selectedInterestsRelay.asObservable()
         )
 
         let output = viewModel.transform(input)
 
-        rx.methodInvoked(#selector(UIViewController.viewWillAppear(_:)))
-            .map { _ in }
-            .bind(to: viewAppearRelay)
+        output.availableInterests
+            .bind(to: interestsRelay)
             .disposed(by: disposeBag)
 
-        output.availableInterests
-            .subscribe(onNext: { [weak self] list in
-                self?.majorCollectionView.updateInterests(list)
-            })
+        interestsRelay
+            .bind(to: majorCollectionView.rx.items(
+                cellIdentifier: MajorCollectionViewCell.identifier,
+                cellType: MajorCollectionViewCell.self
+            )) { [weak self] index, codeEntity, cell in
+                let indexPath = IndexPath(item: index, section: 0)
+                let isSelected = self?.selectedIndexesRelay.value.contains(indexPath) ?? false
+
+                cell.adapt(model: codeEntity)
+                cell.isCheck = isSelected
+            }
             .disposed(by: disposeBag)
 
-        Observable.combineLatest(
-            output.availableInterests,
-            output.userSavedInterests
-        )
-        .subscribe(onNext: { [weak self] (availableInterests, userInterests) in
-            self?.majorCollectionView.preSelectInterests(userInterests)
-        })
-        .disposed(by: disposeBag)
+        majorCollectionView.rx.itemSelected
+            .withUnretained(self)
+            .bind { owner, indexPath in
+                var currentSelected = owner.selectedIndexesRelay.value
+
+                if currentSelected.contains(indexPath) {
+                    currentSelected.remove(indexPath)
+                } else {
+                    currentSelected.insert(indexPath)
+                }
+
+                owner.selectedIndexesRelay.accept(currentSelected)
+                owner.updateSelectedInterests()
+
+                DispatchQueue.main.async {
+                    owner.majorCollectionView.reloadItems(at: [indexPath])
+                }
+            }
+            .disposed(by: disposeBag)
 
         output.selectedInterests
             .map { $0.count }
@@ -110,5 +142,28 @@ public final class InterestFieldViewController: BaseViewController<InterestField
                 }
             })
             .disposed(by: disposeBag)
+
+        output.studentName
+            .drive(onNext: { [weak self] name in
+                self?.interestFieldTitleLabel.setJobisText(
+                    "\(name)님의\n관심사를 선택해주세요",
+                    font: .smallBody,
+                    color: .GrayScale.gray90
+                )
+            })
+            .disposed(by: disposeBag)
+    }
+
+    public override func configureNavigation() {
+        setSmallTitle(title: "관심 분야 선택")
+        navigationItem.largeTitleDisplayMode = .never
+        hideTabbar()
+    }
+
+    private func updateSelectedInterests() {
+        let currentInterests = interestsRelay.value
+        let currentSelectedIndexes = selectedIndexesRelay.value
+        let selectedInterests = currentSelectedIndexes.map { currentInterests[$0.item] }
+        selectedInterestsRelay.accept(selectedInterests)
     }
 }
diff --git a/Projects/Presentation/Sources/InterestField/InterestFieldViewModel.swift b/Projects/Presentation/Sources/InterestField/InterestFieldViewModel.swift
@@ -10,14 +10,18 @@ public final class InterestFieldViewModel: BaseViewModel, Stepper {
     private let disposeBag = DisposeBag()
     private let fetchCodeListUseCase: FetchCodeListUseCase
     private let changeInterestsUseCase: ChangeInterestsUseCase
-    private let isLoading = PublishRelay<Bool>()
+    private let fetchStudentInfoUseCase: FetchStudentInfoUseCase
+    private let studentNameRelay = BehaviorRelay<String>(value: "")
 
-    init(
+    public init(
         fetchCodeListUseCase: FetchCodeListUseCase,
-        changeInterestsUseCase: ChangeInterestsUseCase
+        changeInterestsUseCase: ChangeInterestsUseCase,
+        fetchStudentInfoUseCase: FetchStudentInfoUseCase
     ) {
         self.fetchCodeListUseCase = fetchCodeListUseCase
         self.changeInterestsUseCase = changeInterestsUseCase
+        self.fetchStudentInfoUseCase = fetchStudentInfoUseCase
+        fetchStudentInfo()
     }
 
     public struct Input {
@@ -29,7 +33,7 @@ public final class InterestFieldViewModel: BaseViewModel, Stepper {
     public struct Output {
         let availableInterests: BehaviorRelay<[CodeEntity]>
         let selectedInterests: Driver<[CodeEntity]>
-        let isLoading: Driver<Bool>
+        let studentName: Driver<String>
     }
 
     public func transform(_ input: Input) -> Output {
@@ -50,28 +54,15 @@ public final class InterestFieldViewModel: BaseViewModel, Stepper {
             .withLatestFrom(selectedInterests)
             .emit(onNext: { [weak self] interests in
                 guard let self = self else { return }
-                print("선택된 관심분야: \(interests.map { $0.keyword })")
-                self.isLoading.accept(true)
 
-                let interestsEntities = interests.map { codeEntity in
-                    InterestsEntity(
-                        studentName: "",
-                        interestID: 0,
-                        studentID: 0,
-                        code: codeEntity.code,
-                        keyword: codeEntity.keyword
-                    )
-                }
+                let codeIDs = interests.map { $0.code }
 
-                self.changeInterestsUseCase.execute(interests: interestsEntities)
+                self.changeInterestsUseCase.execute(codeIDs: codeIDs)
                     .subscribe(
                         onCompleted: { [weak self] in
-                            self?.isLoading.accept(false)
                             self?.steps.accept(InterestFieldStep.interestFieldCheckIsRequired)
                         },
-                        onError: { [weak self] error in
-                            self?.isLoading.accept(false)
-                            print("관심분야 업데이트 실패: \(error.localizedDescription)")
+                        onError: { _ in
                         }
                     )
                     .disposed(by: self.disposeBag)
@@ -81,7 +72,19 @@ public final class InterestFieldViewModel: BaseViewModel, Stepper {
         return Output(
             availableInterests: availableInterests,
             selectedInterests: selectedInterests,
-            isLoading: isLoading.asDriver(onErrorJustReturn: false)
+            studentName: studentNameRelay.asDriver()
         )
     }
+
+    private func fetchStudentInfo() {
+        fetchStudentInfoUseCase.execute()
+            .subscribe(
+                onSuccess: { [weak self] studentInfo in
+                    self?.studentNameRelay.accept(studentInfo.studentName)
+                },
+                onFailure: { _ in
+                }
+            )
+            .disposed(by: disposeBag)
+    }
 }
