Skip to content

Commit ecc3777

Browse files
authored
Merge pull request #163 from umc-commit/refactor/timeline
[REFACTOR] 타임라인 필드 순서 변경
2 parents bbc4e7b + 78dc64f commit ecc3777

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

src/request/service/request.service.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -222,16 +222,16 @@ export const RequestService = {
222222

223223
// 타임라인 구성
224224
const timeline = [];
225-
if (request.approvedAt) {
225+
if (request.completedAt) {
226226
timeline.push({
227-
status: 'APPROVED',
228-
timestamp: request.approvedAt.toISOString()
229-
});
227+
status: 'COMPLETED',
228+
timestamp: request.completedAt.toISOString()
229+
});
230230
}
231-
if (paidAt) {
232-
timeline.push({
233-
status: 'PAID',
234-
timestamp: paidAt
231+
if (request.submittedAt) {
232+
timeline.push({
233+
status: 'SUBMITTED',
234+
timestamp: request.submittedAt.toISOString()
235235
});
236236
}
237237
if (request.inProgressAt) {
@@ -240,17 +240,17 @@ export const RequestService = {
240240
timestamp: request.inProgressAt.toISOString()
241241
});
242242
}
243-
if (request.submittedAt) {
244-
timeline.push({
245-
status: 'SUBMITTED',
246-
timestamp: request.submittedAt.toISOString()
243+
if (paidAt) {
244+
timeline.push({
245+
status: 'PAID',
246+
timestamp: paidAt
247247
});
248248
}
249-
if (request.completedAt) {
249+
if (request.approvedAt) {
250250
timeline.push({
251-
status: 'COMPLETED',
252-
timestamp: request.completedAt.toISOString()
253-
});
251+
status: 'APPROVED',
252+
timestamp: request.approvedAt.toISOString()
253+
});
254254
}
255255

256256
// 폼데이터 구성

0 commit comments

Comments
 (0)