specify status ListUserActivities

This commit is contained in:
juzeon 2022-11-25 22:42:58 +08:00
父節點 2462bd3a9d
當前提交 9e82d82117
共有 2 個檔案被更改,包括 15 行新增3 行删除

查看文件

@ -83,9 +83,14 @@ func getUserActivityExtendedSQL(where string) string {
"a.name activity_name from user_activity ua left join activities a on a.id=ua.activity_id " + where +
" order by created_at desc"
}
func (c CheckinDAO) FindAllUserActivities() []dto.UserActivityExtended {
func (c CheckinDAO) FindAllUserActivities(status int) []dto.UserActivityExtended {
var arr []dto.UserActivityExtended
err := c.Tx.Raw(getUserActivityExtendedSQL("")).Find(&arr).Error
var err error
if status != 0 {
err = c.Tx.Raw(getUserActivityExtendedSQL("where status=?"), status).Find(&arr).Error
} else {
err = c.Tx.Raw(getUserActivityExtendedSQL("")).Find(&arr).Error
}
if err != nil {
panic(err)
}

查看文件

@ -65,7 +65,14 @@ func (c CheckinService) ListActivities(aw *app.Wrapper) app.Result {
return aw.Success(checkinDAO.FindAllActivities())
}
func (c CheckinService) ListUserActivities(aw *app.Wrapper) app.Result {
return aw.Success(checkinDAO.FindAllUserActivities())
type StatusReq struct {
Status int `form:"status"`
}
var req StatusReq
if err := aw.Ctx.ShouldBind(&req); err != nil {
return aw.Error(err.Error())
}
return aw.Success(checkinDAO.FindAllUserActivities(req.Status))
}
func (c CheckinService) GetUserActivity(aw *app.Wrapper) app.Result {
id, err := strconv.Atoi(aw.Ctx.Query("id"))