Skip to content

Commit 02d73c4

Browse files
authored
Merge pull request #70 from eunjooChoi/bugs
버그 수정 및 TC 추가
2 parents 38a8ac3 + 862b381 commit 02d73c4

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

PlantingMind/PlantingMind/CoreData/MoodRecords.xcdatamodeld/MoodRecords.xcdatamodel/contents

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22225" systemVersion="23B81" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
33
<entity name="MoodRecord" representedClassName="MoodRecord" syncable="YES">
44
<attribute name="mood" attributeType="String" defaultValueString="normal"/>
5-
<attribute name="reason" optional="YES" attributeType="String" minValueString="0" maxValueString="100"/>
5+
<attribute name="reason" optional="YES" attributeType="String" minValueString="0" maxValueString="101"/>
66
<attribute name="timestamp" attributeType="Date" defaultDateTimeInterval="725731200" usesScalarValueType="NO"/>
77
</entity>
88
</model>

PlantingMind/PlantingMindTests/MoodRecordViewModelTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ final class MoodRecordViewModelTests: XCTestCase {
5555
XCTAssertEqual(viewModel.reason, expectedReason)
5656
}
5757

58-
func test_수정_후_저장_확인() throws {
58+
func test_100자로_수정_후_저장_확인() throws {
5959
let moodRecord = MoodRecord(context: coreDataStack.persistentContainer.viewContext)
6060
moodRecord.mood = Mood.nice.rawValue
6161
moodRecord.reason = "reason reason"
@@ -67,7 +67,7 @@ final class MoodRecordViewModelTests: XCTestCase {
6767
viewModel.save()
6868

6969
let expectedMood = Mood.normal
70-
let expectedReason = "Change Reason"
70+
let expectedReason = "100자 테스트👍🫶🏻💫🙌🏼 100자 테스트👍🫶🏻💫🙌🏼 100자 테스트👍🫶🏻💫🙌🏼 100자 테스트👍🫶🏻💫🙌🏼 100자 테스트👍🫶🏻💫🙌🏼 100자 테스트👍🫶🏻💫🙌🏼 100자 테스트👍🫶🏻💫🙌🏼 abcrdgpeu"
7171

7272
viewModel.mood = expectedMood
7373
viewModel.reason = expectedReason

PlantingMind/PlantingWidget/PlantingWidget.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ struct Provider: TimelineProvider {
2424

2525
func getTimeline(in context: Context, completion: @escaping (Timeline<Entry>) -> ()) {
2626
var entries: [MoodRecordEntry] = []
27-
let currentDate = Date()
27+
let currentDate = Calendar.current.nextDate(after: Date(), matching: DateComponents(minute: 0), matchingPolicy: .nextTime) ?? Date()
2828

2929
for hourOffset in 0 ..< 5 {
3030
let entryDate = Calendar.current.date(byAdding: .hour, value: hourOffset, to: currentDate)!
3131
let data = self.fetchMoods()
3232
entries = [MoodRecordEntry(date: entryDate, moods: data)]
3333
}
3434

35-
let timeline = Timeline(entries: entries, policy: .never)
35+
let timeline = Timeline(entries: entries, policy: .atEnd)
3636
completion(timeline)
3737
}
3838

0 commit comments

Comments
 (0)