Skip to content

Commit 591f383

Browse files
BJCHO0501BJCHO0501
committed
전문약 및 일반약 구분 기능 구현
1 parent 45092cf commit 591f383

30 files changed

Lines changed: 440 additions & 69 deletions

‎Projects/App/Project.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import ProjectDescriptionHelpers
44
let project = Project(
55
name: "FlowApp",
66
organizationName: flowOrganizationName,
7+
options: .options(defaultKnownRegions: ["ko"], developmentRegion: "ko"),
78
settings: .settings(
89
base: .codeSign,
910
configurations: [

‎Projects/App/Sources/Scene/BookMarkDetail/Component/BookMarkResultTableCell.swift‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class BookMarkResultTableCell: UITableViewCell {
2626
$0.textColor = .black2
2727
}
2828
private let updateAtLabel = PaddingLableView()
29+
private let medicineTypeLabel = PaddingLableView()
2930

3031
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
3132
super.init(style: style, reuseIdentifier: reuseIdentifier)
@@ -44,7 +45,8 @@ class BookMarkResultTableCell: UITableViewCell {
4445
medicineImageView,
4546
medicineNameLabel,
4647
companyNameLabel,
47-
updateAtLabel
48+
updateAtLabel,
49+
medicineTypeLabel
4850
)
4951
}
5052

@@ -66,6 +68,10 @@ class BookMarkResultTableCell: UITableViewCell {
6668
$0.top.equalTo(companyNameLabel.snp.bottom).offset(8)
6769
$0.leading.equalTo(companyNameLabel)
6870
}
71+
medicineTypeLabel.snp.makeConstraints {
72+
$0.top.equalTo(updateAtLabel)
73+
$0.leading.equalTo(updateAtLabel.snp.trailing).offset(5)
74+
}
6975
}
7076
}
7177

@@ -78,5 +84,7 @@ extension BookMarkResultTableCell {
7884
medicineNameLabel.text = entity.medicineName
7985
companyNameLabel.text = entity.companyName
8086
updateAtLabel.contentText = entity.updateDate
87+
medicineTypeLabel.contentText = entity.medicineType.toString
88+
medicineTypeLabel.setTagType(tagType: entity.medicineType == .NOMAL ? .Common : .Primary)
8189
}
8290
}

‎Projects/App/Sources/Scene/MedicineDetail/MedicineDetailViewController.swift‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class MedicineDetailViewController: BaseVC<MedicineDetailViewModel> {
3434

3535
private let colorTagButton = ColorTagButton()
3636
private let medicineCodeLabel = PaddingLableView()
37+
private let medicineTypeLabel = PaddingLableView()
3738
private let bookMarkButton = BookMarkToggleButton()
3839
private let explainVStack = VStack(spacing: 20)
3940
private let efficacyExplain = ExplainFormView(title: "효능")
@@ -57,6 +58,7 @@ class MedicineDetailViewController: BaseVC<MedicineDetailViewModel> {
5758
companyNameLabel,
5859
medicineNameLabel,
5960
medicineCodeLabel,
61+
medicineTypeLabel,
6062
explainVStack
6163
)
6264
medicineImageView.addSubview(updateAtLabel)
@@ -98,6 +100,10 @@ class MedicineDetailViewController: BaseVC<MedicineDetailViewModel> {
98100
$0.top.equalTo(medicineNameLabel.snp.bottom).offset(5)
99101
$0.leading.equalToSuperview().inset(20)
100102
}
103+
medicineTypeLabel.snp.makeConstraints {
104+
$0.top.equalTo(medicineCodeLabel)
105+
$0.leading.equalTo(medicineCodeLabel.snp.trailing).offset(5)
106+
}
101107
explainVStack.snp.makeConstraints {
102108
$0.top.equalTo(medicineCodeLabel.snp.bottom).offset(25)
103109
$0.leading.trailing.equalToSuperview().inset(20)
@@ -129,7 +135,8 @@ class MedicineDetailViewController: BaseVC<MedicineDetailViewModel> {
129135
interaction: item.interaction,
130136
sideEffect: item.sideEffect,
131137
storageMethod: item.storageMethod,
132-
updateDate: item.updateDate
138+
updateDate: item.updateDate,
139+
medicineType: item.medicineType
133140
)
134141
self?.item = noColorItem
135142
})
@@ -179,6 +186,8 @@ extension MedicineDetailViewController {
179186

180187
updateAtLabel.contentText = "마지막 업데이트: \(entity.updateDate)"
181188
medicineCodeLabel.contentText = entity.itemCode
189+
medicineTypeLabel.contentText = entity.medicineType.toString
190+
medicineTypeLabel.setTagType(tagType: entity.medicineType == .NOMAL ? .Common : .Primary)
182191
item = entity
183192
}
184193
}
@@ -209,7 +218,8 @@ extension MedicineDetailViewController {
209218
sideEffect: item.sideEffect,
210219
storageMethod: item.storageMethod,
211220
updateDate: item.updateDate,
212-
tagHexColorCode: selectColor?.hexCode
221+
tagHexColorCode: selectColor?.hexCode,
222+
medicineType: item.medicineType
213223
)
214224
self.item = changedEntity
215225
colorTagButton.tagColor = UIColor(hex: selectColor?.hexCode)

‎Projects/App/Sources/Scene/Search/Component/SearchResultTableCell.swift‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class SearchResultTableCell: UITableViewCell {
2626
$0.textColor = .black2
2727
}
2828
private let updateAtLabel = PaddingLableView()
29+
private let medicineTypeLabel = PaddingLableView()
2930

3031
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
3132
super.init(style: style, reuseIdentifier: reuseIdentifier)
@@ -44,7 +45,8 @@ class SearchResultTableCell: UITableViewCell {
4445
medicineImageView,
4546
medicineNameLabel,
4647
companyNameLabel,
47-
updateAtLabel
48+
updateAtLabel,
49+
medicineTypeLabel
4850
)
4951
}
5052

@@ -66,6 +68,10 @@ class SearchResultTableCell: UITableViewCell {
6668
$0.top.equalTo(companyNameLabel.snp.bottom).offset(8)
6769
$0.leading.equalTo(companyNameLabel)
6870
}
71+
medicineTypeLabel.snp.makeConstraints {
72+
$0.top.equalTo(updateAtLabel)
73+
$0.leading.equalTo(updateAtLabel.snp.trailing).offset(5)
74+
}
6975
}
7076
}
7177

@@ -78,5 +84,7 @@ extension SearchResultTableCell {
7884
medicineNameLabel.text = entity.medicineName
7985
companyNameLabel.text = entity.companyName
8086
updateAtLabel.contentText = entity.updateDate
87+
medicineTypeLabel.contentText = entity.medicineType.toString
88+
medicineTypeLabel.setTagType(tagType: entity.medicineType == .NOMAL ? .Common : .Primary)
8189
}
8290
}

‎Projects/App/SupportingFiles/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>1.1.1</string>
22+
<string>1.2.0</string>
2323
<key>CFBundleVersion</key>
24-
<string>1</string>
24+
<string>2</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
2727
<key>NSAppTransportSecurity</key>

‎Projects/Modules/FlowKit/Sources/Component/PaddingLableView.swift‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,30 @@ import UIKit
55
import SnapKit
66
import Then
77

8+
public enum TagType {
9+
case Common, Primary
10+
11+
var backgroundColor: UIColor {
12+
switch self {
13+
case .Common: return .blue5
14+
case .Primary: return .blue1
15+
}
16+
}
17+
18+
var textColor: UIColor {
19+
switch self {
20+
case .Common: return .blue1
21+
case .Primary: return .white
22+
}
23+
}
24+
}
25+
826
public class PaddingLableView: UIView {
927
private let contentLabel = UILabel().then {
1028
$0.font = .captionC2SemiBold
1129
$0.textColor = .blue1
1230
}
13-
31+
1432
public var contentText: String? {
1533
set {
1634
contentLabel.text = newValue
@@ -19,9 +37,15 @@ public class PaddingLableView: UIView {
1937
get { contentLabel.text }
2038
}
2139

22-
public init() {
40+
public func setTagType(tagType: TagType) {
41+
contentLabel.textColor = tagType.textColor
42+
self.backgroundColor = tagType.backgroundColor
43+
}
44+
45+
public init(tagType: TagType = .Common) {
2346
super.init(frame: .zero)
24-
backgroundColor = .blue5
47+
self.backgroundColor = tagType.backgroundColor
48+
contentLabel.textColor = tagType.textColor
2549
layer.cornerRadius = 3
2650
settingLayout()
2751
}

‎Projects/Modules/FlowService/Sources/DI/ServiceDI.swift‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,15 @@ public extension ServiceDI {
2323
static func resolve() -> ServiceDI {
2424
// DataSource
2525
let medicineContentDataSource: MedicineContentDataSource = MedicineContentDataSourceImpl()
26+
let prescriptionMedicineDataSource: PrescriptionMedicineDataSource = PrescriptionMedicineDataSourceImpl()
2627
let bookMakrDataSource: BookMarkMedicineDataSource = BookMarkMedicineDataSourceImpl()
28+
let medicineTypeDataSource: MedicineTypeDataSource = MedicineTypeDataSourceImpl()
2729
let takenMedicineDataSource: TakenMedicineDataSource = TakenMedicineDataSourceImpl()
2830

2931
// Repository
3032
let insertBookMarkMedicineRepositoryImpl = InsertBookMarkMedicineRepositoryImpl(
31-
dataSource: bookMakrDataSource
33+
bookMarkMedicineDataSource: bookMakrDataSource,
34+
medicineTypeDataSource: medicineTypeDataSource
3235
)
3336
let deleteBookMarkMedicineRepositoryImpl = DeleteBookMarkMedicineRepositoryImpl(
3437
dataSource: bookMakrDataSource
@@ -52,7 +55,8 @@ public extension ServiceDI {
5255
dataBase: takenMedicineDataSource
5356
)
5457
let searchMedicineRepositoryImpl = SearchMedicineRepositoryImpl(
55-
dataSource: medicineContentDataSource
58+
nomalMedicinedataSource: medicineContentDataSource,
59+
prescriptionMedicinedataSource: prescriptionMedicineDataSource
5660
)
5761

5862
// UseCase

‎Projects/Modules/FlowService/Sources/Repository/BookMark/InsertBookMarkMedicineRepositoryImpl.swift‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,30 @@ import Model
77
import LocalService
88

99
class InsertBookMarkMedicineRepositoryImpl: InsertBookMarkMedicineRepository {
10-
var dataSource: BookMarkMedicineDataSource
10+
var bookMarkMedicineDataSource: BookMarkMedicineDataSource
11+
var medicineTypeDataSource: MedicineTypeDataSource
1112

12-
init(dataSource: BookMarkMedicineDataSource) {
13-
self.dataSource = dataSource
13+
init(bookMarkMedicineDataSource: BookMarkMedicineDataSource, medicineTypeDataSource: MedicineTypeDataSource) {
14+
self.bookMarkMedicineDataSource = bookMarkMedicineDataSource
15+
self.medicineTypeDataSource = medicineTypeDataSource
1416
}
1517

1618
func insertBookMarkMedicine(with entity: MedicineInfoEntity) -> Completable {
17-
dataSource.insertBookMarkMedicine(with: entity)
19+
let bookmakrObservable = bookMarkMedicineDataSource.insertBookMarkMedicine(with: entity).asObservable()
20+
let medicineTypeObservable = medicineTypeDataSource.insertMedicineType(with: entity.itemCode, type: entity.medicineType).asObservable()
21+
let observable = Observable.combineLatest(bookmakrObservable, medicineTypeObservable)
22+
23+
return Completable.create { Completable in
24+
Completable(.completed)
25+
observable
26+
.subscribe(onError: { error in
27+
Completable(.error(error))
28+
}, onCompleted: {
29+
Completable(.completed)
30+
})
31+
.disposed(by: DisposeBag())
32+
33+
return Disposables.create()
34+
}
1835
}
1936
}

‎Projects/Modules/FlowService/Sources/Repository/BookMark/Protocol/InsertBookMarkMedicineRepository.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import Model
77
import LocalService
88

99
public protocol InsertBookMarkMedicineRepository {
10-
var dataSource: BookMarkMedicineDataSource { get }
10+
var bookMarkMedicineDataSource: BookMarkMedicineDataSource { get }
11+
var medicineTypeDataSource: MedicineTypeDataSource { get }
1112

1213
func insertBookMarkMedicine(with entity: MedicineInfoEntity) -> Completable
1314
}

‎Projects/Modules/FlowService/Sources/Repository/MedicineContent/Protocol/SearchMedicineRepository.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import RemoteService
77
import RxSwift
88

99
public protocol SearchMedicineRepository {
10-
var dataSource: MedicineContentDataSource { get }
10+
var nomalMedicinedataSource: MedicineContentDataSource { get }
11+
var prescriptionMedicinedataSource: PrescriptionMedicineDataSource { get }
1112

1213
func searchMedicine(with name: String) -> Single<[MedicineInfoEntity]>
1314
}

0 commit comments

Comments
 (0)