mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-21 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

transaction tag supports soft delete

Browse Source
This commit is contained in:
MaysWind
2021-01-17 23:59:39 +08:00
parent f29a14ad51
commit 639ab1d758
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/models/transaction_tag.go
+4 -2
View File
@@ -3,12 +3,14 @@ package models
// TransactionTag represents transaction tag data stored in database // TransactionTag represents transaction tag data stored in database
type TransactionTag struct { type TransactionTag struct {
TagId int64 `xorm:"PK"` TagId int64 `xorm:"PK"`
Uid int64 `xorm:"UNIQUE(UQE_tag_uid_name) NOT NULL"` Uid int64 `xorm:"INDEX(IDX_tag_uid_deleted_name) NOT NULL"`
Name string `xorm:"UNIQUE(UQE_tag_uid_name) VARCHAR(32) NOT NULL"` Deleted bool `xorm:"INDEX(IDX_tag_uid_deleted_name) NOT NULL"`
Name string `xorm:"INDEX(IDX_tag_uid_deleted_name) VARCHAR(32) NOT NULL"`
DisplayOrder int `xorm:"NOT NULL"` DisplayOrder int `xorm:"NOT NULL"`
Hidden bool `xorm:"NOT NULL"` Hidden bool `xorm:"NOT NULL"`
CreatedUnixTime int64 CreatedUnixTime int64
UpdatedUnixTime int64 UpdatedUnixTime int64
DeletedUnixTime int64
} }
// TransactionTagGetRequest represents all parameters of transaction tag getting request // TransactionTagGetRequest represents all parameters of transaction tag getting request
pkg/services/transaction_tags.go
+16 -8
View File
@@ -36,7 +36,7 @@ func (s *TransactionTagService) GetAllTagsByUid(uid int64) ([]*models.Transactio
} }
var tags []*models.TransactionTag var tags []*models.TransactionTag
err := s.UserDataDB(uid).Where("uid=?", uid).Find(&tags) err := s.UserDataDB(uid).Where("uid=? AND deleted=?", uid, false).Find(&tags)
return tags, err return tags, err
} }
@@ -52,7 +52,7 @@ func (s *TransactionTagService) GetTagByTagId(uid int64, tagId int64) (*models.T
} }
tag := &models.TransactionTag{} tag := &models.TransactionTag{}
has, err := s.UserDataDB(uid).ID(tagId).Where("uid=?", uid).Get(tag) has, err := s.UserDataDB(uid).ID(tagId).Where("uid=? AND deleted=?", uid, false).Get(tag)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -70,7 +70,7 @@ func (s *TransactionTagService) GetMaxDisplayOrder(uid int64) (int, error) {
} }
tag := &models.TransactionTag{} tag := &models.TransactionTag{}
has, err := s.UserDataDB(uid).Cols("uid", "display_order").Where("uid=?", uid).OrderBy("display_order desc").Limit(1).Get(tag) has, err := s.UserDataDB(uid).Cols("uid", "deleted", "display_order").Where("uid=? AND deleted=?", uid, false).OrderBy("display_order desc").Limit(1).Get(tag)
if err != nil { if err != nil {
return 0, err return 0, err
@@ -127,6 +127,7 @@ func (s *TransactionTagService) CreateTag(tag *models.TransactionTag) error {
tag.TagId = s.GenerateUuid(uuid.UUID_TYPE_TAG) tag.TagId = s.GenerateUuid(uuid.UUID_TYPE_TAG)
tag.Deleted = false
tag.CreatedUnixTime = time.Now().Unix() tag.CreatedUnixTime = time.Now().Unix()
tag.UpdatedUnixTime = time.Now().Unix() tag.UpdatedUnixTime = time.Now().Unix()
@@ -153,7 +154,7 @@ func (s *TransactionTagService) ModifyTag(tag *models.TransactionTag) error {
tag.UpdatedUnixTime = time.Now().Unix() tag.UpdatedUnixTime = time.Now().Unix()
return s.UserDataDB(tag.Uid).DoTransaction(func(sess *xorm.Session) error { return s.UserDataDB(tag.Uid).DoTransaction(func(sess *xorm.Session) error {
updatedRows, err := sess.ID(tag.TagId).Cols("name", "updated_unix_time").Where("uid=?", tag.Uid).Update(tag) updatedRows, err := sess.ID(tag.TagId).Cols("name", "updated_unix_time").Where("uid=? AND deleted=?", tag.Uid, false).Update(tag)
if err != nil { if err != nil {
return err return err
@@ -179,7 +180,7 @@ func (s *TransactionTagService) HideTag(uid int64, ids []int64, hidden bool) err
} }
return s.UserDataDB(uid).DoTransaction(func(sess *xorm.Session) error { return s.UserDataDB(uid).DoTransaction(func(sess *xorm.Session) error {
updatedRows, err := sess.Cols("hidden", "updated_unix_time").Where("uid=?", uid).In("tag_id", ids).Update(updateModel) updatedRows, err := sess.Cols("hidden", "updated_unix_time").Where("uid=? AND deleted=?", uid, false).In("tag_id", ids).Update(updateModel)
if err != nil { if err != nil {
return err return err
@@ -204,7 +205,7 @@ func (s *TransactionTagService) ModifyTagDisplayOrders(uid int64, tags []*models
return s.UserDataDB(uid).DoTransaction(func(sess *xorm.Session) error { return s.UserDataDB(uid).DoTransaction(func(sess *xorm.Session) error {
for i := 0; i < len(tags); i++ { for i := 0; i < len(tags); i++ {
tag := tags[i] tag := tags[i]
updatedRows, err := sess.ID(tag.TagId).Cols("display_order", "updated_unix_time").Where("uid=?", uid).Update(tag) updatedRows, err := sess.ID(tag.TagId).Cols("display_order", "updated_unix_time").Where("uid=? AND deleted=?", uid, false).Update(tag)
if err != nil { if err != nil {
return err return err
@@ -223,6 +224,13 @@ func (s *TransactionTagService) DeleteTag(uid int64, tagId int64) error {
return errs.ErrUserIdInvalid return errs.ErrUserIdInvalid
} }
now := time.Now().Unix()
updateModel := &models.TransactionTag{
Deleted: true,
DeletedUnixTime: now,
}
return s.UserDataDB(uid).DoTransaction(func(sess *xorm.Session) error { return s.UserDataDB(uid).DoTransaction(func(sess *xorm.Session) error {
exists, err := sess.Cols("uid", "tag_id").Where("uid=? AND tag_id=?", uid, tagId).Limit(1).Exist(&models.TransactionTagIndex{}) exists, err := sess.Cols("uid", "tag_id").Where("uid=? AND tag_id=?", uid, tagId).Limit(1).Exist(&models.TransactionTagIndex{})
@@ -232,7 +240,7 @@ func (s *TransactionTagService) DeleteTag(uid int64, tagId int64) error {
return errs.ErrTransactionTagInUseCannotBeDeleted return errs.ErrTransactionTagInUseCannotBeDeleted
} }
deletedRows, err := sess.ID(tagId).Where("uid=?", uid).Delete(&models.TransactionTag{}) deletedRows, err := sess.ID(tagId).Cols("deleted", "deleted_unix_time").Where("uid=? AND deleted=?", uid, false).Update(updateModel)
if err != nil { if err != nil {
return err return err
@@ -250,7 +258,7 @@ func (s *TransactionTagService) ExistsTagName(uid int64, name string) (bool, err
return false, errs.ErrTransactionTagNameIsEmpty return false, errs.ErrTransactionTagNameIsEmpty
} }
return s.UserDB().Cols("name").Where("uid=? AND name=?", uid, name).Exist(&models.TransactionTag{}) return s.UserDB().Cols("name").Where("uid=? AND deleted=? AND name=?", uid, false, name).Exist(&models.TransactionTag{})
} }
// GetTagMapByList returns a transaction tag map by a list // GetTagMapByList returns a transaction tag map by a list