Skip to content

Commit 2212671

Browse files
authored
Merge pull request #135 from lirlia/feature/increase-valid-term
feat: Add support for additional periods in APIRequestsPostReq
2 parents 07f6430 + ee53a24 commit 2212671

File tree

5 files changed

+76
-16
lines changed

5 files changed

+76
-16
lines changed

api/api.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,18 @@ paths:
404404
- 10
405405
- 30
406406
- 60
407+
# 12hours
408+
- 720
409+
# 1day
410+
- 1440
411+
# 2days
412+
- 2880
413+
# 3days
414+
- 4320
415+
# 1week
416+
- 10080
417+
# 2weeks
418+
- 20160
407419
reason:
408420
type: string
409421
maxLength: 500

api/prel_api/oas_schemas_gen.go

+16-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/prel_api/oas_validators_gen.go

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/model/period.go

+30-12
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,46 @@ import (
88
type PeriodKey int
99

1010
const (
11-
PeriodKey5 PeriodKey = 5
12-
PeriodKey10 PeriodKey = 10
13-
PeriodKey30 PeriodKey = 30
14-
PeriodKey60 PeriodKey = 60
11+
PeriodKey5 PeriodKey = 5
12+
PeriodKey10 PeriodKey = 10
13+
PeriodKey30 PeriodKey = 30
14+
PeriodKey60 PeriodKey = 60
15+
PeriodKey720 PeriodKey = 720 // 12 hours
16+
PeriodKey1440 PeriodKey = 1440 // 1 day
17+
PeriodKey2880 PeriodKey = 2880 // 2 days
18+
PeriodKey4320 PeriodKey = 4320 // 3 days
19+
PeriodKey5760 PeriodKey = 10080 // 1 week
20+
PeriodKey10080 PeriodKey = 20160 // 2 weeks
1521
)
1622

1723
var periodMap = map[PeriodKey]string{
18-
PeriodKey5: "5 minutes",
19-
PeriodKey10: "10 minutes",
20-
PeriodKey30: "30 minutes",
21-
PeriodKey60: "1 hour",
24+
PeriodKey5: "5 minutes",
25+
PeriodKey10: "10 minutes",
26+
PeriodKey30: "30 minutes",
27+
PeriodKey60: "1 hour",
28+
PeriodKey720: "12 hours",
29+
PeriodKey1440: "1 day",
30+
PeriodKey2880: "2 days",
31+
PeriodKey4320: "3 days",
32+
PeriodKey5760: "1 week",
33+
PeriodKey10080: "2 weeks",
2234
}
2335

2436
func PeriodMap() map[PeriodKey]string {
2537
return periodMap
2638
}
2739

2840
var periodTimeMap = map[PeriodKey]time.Duration{
29-
PeriodKey5: 5 * time.Minute,
30-
PeriodKey10: 10 * time.Minute,
31-
PeriodKey30: 30 * time.Minute,
32-
PeriodKey60: 1 * time.Hour,
41+
PeriodKey5: 5 * time.Minute,
42+
PeriodKey10: 10 * time.Minute,
43+
PeriodKey30: 30 * time.Minute,
44+
PeriodKey60: 1 * time.Hour,
45+
PeriodKey720: 12 * time.Hour,
46+
PeriodKey1440: 24 * time.Hour,
47+
PeriodKey2880: 48 * time.Hour,
48+
PeriodKey4320: 72 * time.Hour,
49+
PeriodKey5760: 7 * 24 * time.Hour,
50+
PeriodKey10080: 14 * 24 * time.Hour,
3351
}
3452

3553
type Clock interface {

internal/model/request_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ var _ = Describe("Request", func() {
6060
Entry("10 min", model.PeriodKey10, clock.Now().Add(10*time.Minute), false),
6161
Entry("30 min", model.PeriodKey30, clock.Now().Add(30*time.Minute), false),
6262
Entry("1 hour", model.PeriodKey60, clock.Now().Add(1*time.Hour), false),
63+
Entry("12 hour", model.PeriodKey720, clock.Now().Add(12*time.Hour), false),
64+
Entry("1 day", model.PeriodKey1440, clock.Now().Add(24*time.Hour), false),
65+
Entry("2 days", model.PeriodKey2880, clock.Now().Add(48*time.Hour), false),
66+
Entry("3 days", model.PeriodKey4320, clock.Now().Add(72*time.Hour), false),
67+
Entry("1 week", model.PeriodKey5760, clock.Now().Add(7*24*time.Hour), false),
68+
Entry("2 weeks", model.PeriodKey10080, clock.Now().Add(14*24*time.Hour), false),
6369
Entry("5 hour", model.PeriodKey(300), clock.Now().Add(5*time.Hour), true),
6470
)
6571
})

0 commit comments

Comments
 (0)