diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 53c2d0f..9d7337f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,13 @@
-
+
+
+
+
+
+
@@ -158,7 +163,6 @@
-
@@ -183,7 +187,8 @@
-
+
+
diff --git a/pkg/authkit/models/sign_record.go b/pkg/authkit/models/check_in.go
similarity index 88%
rename from pkg/authkit/models/sign_record.go
rename to pkg/authkit/models/check_in.go
index 9afeaf2..9191924 100644
--- a/pkg/authkit/models/sign_record.go
+++ b/pkg/authkit/models/check_in.go
@@ -1,6 +1,6 @@
package models
-type SignRecord struct {
+type CheckInRecord struct {
BaseModel
ResultTier int `json:"result_tier"`
diff --git a/pkg/internal/database/migrator.go b/pkg/internal/database/migrator.go
index 4612ba2..0b7cc7e 100644
--- a/pkg/internal/database/migrator.go
+++ b/pkg/internal/database/migrator.go
@@ -25,7 +25,7 @@ var AutoMaintainRange = []any{
&models.NotificationSubscriber{},
&models.AuditRecord{},
&models.ApiKey{},
- &models.SignRecord{},
+ &models.CheckInRecord{},
&models.PreferenceNotification{},
&models.PreferenceAuth{},
&models.AbuseReport{},
diff --git a/pkg/internal/http/api/sign_api.go b/pkg/internal/http/api/check_in_api.go
similarity index 83%
rename from pkg/internal/http/api/sign_api.go
rename to pkg/internal/http/api/check_in_api.go
index 4d72151..9d59024 100644
--- a/pkg/internal/http/api/sign_api.go
+++ b/pkg/internal/http/api/check_in_api.go
@@ -9,7 +9,7 @@ import (
"strconv"
)
-func listDailySignRecord(c *fiber.Ctx) error {
+func listCheckInRecord(c *fiber.Ctx) error {
take := c.QueryInt("take", 0)
offset := c.QueryInt("offset", 0)
@@ -20,13 +20,13 @@ func listDailySignRecord(c *fiber.Ctx) error {
var count int64
if err := database.C.
- Model(&models.SignRecord{}).
+ Model(&models.CheckInRecord{}).
Where("account_id = ?", user.ID).
Count(&count).Error; err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error())
}
- var records []models.SignRecord
+ var records []models.CheckInRecord
if err := database.C.
Where("account_id = ?", user.ID).
Limit(take).Offset(offset).
@@ -41,7 +41,7 @@ func listDailySignRecord(c *fiber.Ctx) error {
})
}
-func listOtherUserDailySignRecord(c *fiber.Ctx) error {
+func listOtherUserCheckInRecord(c *fiber.Ctx) error {
take := c.QueryInt("take", 0)
offset := c.QueryInt("offset", 0)
@@ -56,13 +56,13 @@ func listOtherUserDailySignRecord(c *fiber.Ctx) error {
var count int64
if err := database.C.
- Model(&models.SignRecord{}).
+ Model(&models.CheckInRecord{}).
Where("account_id = ?", account.ID).
Count(&count).Error; err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error())
}
- var records []models.SignRecord
+ var records []models.CheckInRecord
if err := database.C.
Where("account_id = ?", account.ID).
Limit(take).Offset(offset).
@@ -77,26 +77,26 @@ func listOtherUserDailySignRecord(c *fiber.Ctx) error {
})
}
-func getTodayDailySign(c *fiber.Ctx) error {
+func getTodayCheckIn(c *fiber.Ctx) error {
if err := exts.EnsureAuthenticated(c); err != nil {
return err
}
user := c.Locals("user").(models.Account)
- if record, err := services.GetTodayDailySign(user); err != nil {
+ if record, err := services.GetTodayCheckIn(user); err != nil {
return fiber.NewError(fiber.StatusNotFound, err.Error())
} else {
return c.JSON(record)
}
}
-func doDailySign(c *fiber.Ctx) error {
+func doCheckIn(c *fiber.Ctx) error {
if err := exts.EnsureAuthenticated(c); err != nil {
return err
}
user := c.Locals("user").(models.Account)
- if record, err := services.DailySign(user); err != nil {
+ if record, err := services.CheckIn(user); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
} else {
services.AddEvent(user.ID, "dailySign", strconv.Itoa(int(record.ID)), c.IP(), c.Get(fiber.HeaderUserAgent))
diff --git a/pkg/internal/http/api/index.go b/pkg/internal/http/api/index.go
index 03980a3..d2f1c72 100644
--- a/pkg/internal/http/api/index.go
+++ b/pkg/internal/http/api/index.go
@@ -10,11 +10,11 @@ func MapAPIs(app *fiber.App, baseURL string) {
api := app.Group(baseURL).Name("API")
{
- daily := api.Group("/daily").Name("Daily Sign API")
+ checkIn := api.Group("/check-in").Name("Daily Check In API")
{
- daily.Get("/", listDailySignRecord)
- daily.Get("/today", getTodayDailySign)
- daily.Post("/", doDailySign)
+ checkIn.Get("/", listCheckInRecord)
+ checkIn.Get("/today", getTodayCheckIn)
+ checkIn.Post("/", doCheckIn)
}
notify := api.Group("/notifications").Name("Notifications API")
@@ -97,7 +97,7 @@ func MapAPIs(app *fiber.App, baseURL string) {
directory.Get("/", getOtherUserinfo)
directory.Get("/status", getStatus)
- directory.Get("/daily", listOtherUserDailySignRecord)
+ directory.Get("/check-in", listOtherUserCheckInRecord)
}
api.Get("/users", getOtherUserinfoBatch)
diff --git a/pkg/internal/services/sign.go b/pkg/internal/services/check_in.go
similarity index 81%
rename from pkg/internal/services/sign.go
rename to pkg/internal/services/check_in.go
index 051a7b4..559dafe 100644
--- a/pkg/internal/services/sign.go
+++ b/pkg/internal/services/check_in.go
@@ -11,10 +11,10 @@ import (
"time"
)
-func CheckDailyCanSign(user models.Account) error {
+func CheckCanCheckIn(user models.Account) error {
probe := time.Now().Format("2006-01-02")
- var record models.SignRecord
+ var record models.CheckInRecord
if err := database.C.Where("account_id = ? AND created_at::date = ?", user.ID, probe).First(&record).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil
@@ -24,25 +24,25 @@ func CheckDailyCanSign(user models.Account) error {
return fmt.Errorf("daliy sign record exists")
}
-func GetTodayDailySign(user models.Account) (models.SignRecord, error) {
+func GetTodayCheckIn(user models.Account) (models.CheckInRecord, error) {
probe := time.Now().Format("2006-01-02")
- var record models.SignRecord
+ var record models.CheckInRecord
if err := database.C.Where("account_id = ? AND created_at::date = ?", user.ID, probe).First(&record).Error; err != nil {
return record, fmt.Errorf("unable get daliy sign record: %v", err)
}
return record, nil
}
-func DailySign(user models.Account) (models.SignRecord, error) {
+func CheckIn(user models.Account) (models.CheckInRecord, error) {
tier := rand.Intn(5)
- record := models.SignRecord{
+ record := models.CheckInRecord{
ResultTier: tier,
ResultExperience: rand.Intn(int(math.Max(float64(tier), 1)*100)+1-100) + 100,
AccountID: user.ID,
}
- if err := CheckDailyCanSign(user); err != nil {
+ if err := CheckCanCheckIn(user); err != nil {
return record, fmt.Errorf("today already signed")
}