refactor: delete primary key

Author: afumu

gplus/base_dao.go

@@ -64,17 +64,13 @@ func InsertBatchSize[T any](entities []*T, batchSize int) *gorm.DB {
 	return resultDb
 }
 
-func DeleteById[T any, K PrimaryKey](id K, primaryKeyColumn ...string) *gorm.DB {
+func DeleteById[T any](id any, primaryKeyColumn ...string) *gorm.DB {
 	var entity T
 	resultDb := gormDb.Where(getPKColumn(primaryKeyColumn), id).Delete(&entity)
 	return resultDb
 }
 
-func DeleteByIds[T any, K PrimaryKey](ids []K, primaryKeyColumn ...string) *gorm.DB {
-	if len(ids) == 0 {
-		return gormDb
-	}
-
+func DeleteByIds[T any](ids any, primaryKeyColumn ...string) *gorm.DB {
 	q := NewQuery[T]()
 	q.In(getPKColumn(primaryKeyColumn), ids)
 	resultDb := Delete[T](q)
@@ -87,7 +83,7 @@ func Delete[T any](q *Query[T]) *gorm.DB {
 	return resultDb
 }
 
-func UpdateById[T any, K PrimaryKey](entity *T, id K, primaryKeyColumn ...string) *gorm.DB {
+func UpdateById[T any](entity *T, id any, primaryKeyColumn ...string) *gorm.DB {
 	resultDb := gormDb.Model(&entity).Where(getPKColumn(primaryKeyColumn), id).Updates(entity)
 	return resultDb
 }
@@ -97,7 +93,7 @@ func Update[T any](q *Query[T]) *gorm.DB {
 	return resultDb
 }
 
-func SelectById[T any, K PrimaryKey](id K) (*T, *gorm.DB) {
+func SelectById[T any](id any) (*T, *gorm.DB) {
 	var entity T
 	resultDb := gormDb.Take(&entity, id)
 	if resultDb.RowsAffected == 0 {
@@ -106,7 +102,7 @@ func SelectById[T any, K PrimaryKey](id K) (*T, *gorm.DB) {
 	return &entity, resultDb
 }
 
-func SelectByIds[T any, K PrimaryKey](ids []K, primaryKeyColumn ...string) ([]*T, *gorm.DB) {
+func SelectByIds[T any](ids any, primaryKeyColumn ...string) ([]*T, *gorm.DB) {
 	q := NewQuery[T]()
 	q.In(getPKColumn(primaryKeyColumn), ids)
 	return SelectList[T](q)

gplus/common_dao.go

@@ -21,82 +21,80 @@ import (
 	"gorm.io/gorm"
 )
 
-type CommonDao[T any, K PrimaryKey] struct {
-	pkColumn string
-}
+type CommonDao[T any] struct{}
 
-func NewCommonDao[T any, K PrimaryKey](pk string) *CommonDao[T, K] {
-	return &CommonDao[T, K]{pkColumn: pk}
+func NewCommonDao[T any](pk string) *CommonDao[T] {
+	return &CommonDao[T]{}
 }
 
-func (service CommonDao[T, K]) Db() *gorm.DB {
+func (service CommonDao[T]) Db() *gorm.DB {
 	return gormDb
 }
 
-func (service CommonDao[T, K]) Save(entity *T) *gorm.DB {
+func (service CommonDao[T]) Save(entity *T) *gorm.DB {
 	return Insert[T](entity)
 }
 
-func (service CommonDao[T, K]) SaveBatch(entities []*T) *gorm.DB {
+func (service CommonDao[T]) SaveBatch(entities []*T) *gorm.DB {
 	return InsertBatch[T](entities)
 }
 
-func (service CommonDao[T, K]) SaveBatchSize(entities []*T, batchSize int) *gorm.DB {
+func (service CommonDao[T]) SaveBatchSize(entities []*T, batchSize int) *gorm.DB {
 	return InsertBatchSize[T](entities, batchSize)
 }
 
-func (service CommonDao[T, K]) RemoveById(id K) *gorm.DB {
-	return DeleteById[T, K](id, service.pkColumn)
+func (service CommonDao[T]) RemoveById(id any) *gorm.DB {
+	return DeleteById[T](id)
 }
 
-func (service CommonDao[T, K]) RemoveByIds(ids []K) *gorm.DB {
-	return DeleteByIds[T, K](ids)
+func (service CommonDao[T]) RemoveByIds(ids []any) *gorm.DB {
+	return DeleteByIds[T](ids)
 }
 
-func (service CommonDao[T, K]) Remove(q *Query[T]) *gorm.DB {
+func (service CommonDao[T]) Remove(q *Query[T]) *gorm.DB {
 	return Delete[T](q)
 }
 
-func (service CommonDao[T, K]) UpdateById(entity *T, id K) *gorm.DB {
-	return UpdateById[T, K](entity, id, service.pkColumn)
+func (service CommonDao[T]) UpdateById(entity *T, id any) *gorm.DB {
+	return UpdateById[T](entity, id)
 }
 
-func (service CommonDao[T, K]) Update(q *Query[T]) *gorm.DB {
+func (service CommonDao[T]) Update(q *Query[T]) *gorm.DB {
 	return Update[T](q)
 }
 
-func (service CommonDao[T, K]) GetById(id K) (*T, *gorm.DB) {
-	return SelectById[T, K](id)
+func (service CommonDao[T]) GetById(id any) (*T, *gorm.DB) {
+	return SelectById[T](id)
 }
 
-func (service CommonDao[T, K]) GetOne(q *Query[T]) (*T, *gorm.DB) {
+func (service CommonDao[T]) GetOne(q *Query[T]) (*T, *gorm.DB) {
 	return SelectOne[T](q)
 }
 
-func (service CommonDao[T, K]) ListAll() ([]*T, *gorm.DB) {
+func (service CommonDao[T]) ListAll() ([]*T, *gorm.DB) {
 	return SelectList[T](nil)
 }
 
-func (service CommonDao[T, K]) List(q *Query[T]) ([]*T, *gorm.DB) {
+func (service CommonDao[T]) List(q *Query[T]) ([]*T, *gorm.DB) {
 	return SelectList[T](q)
 }
 
-func (service CommonDao[T, K]) ListByIds(ids []K) ([]*T, *gorm.DB) {
-	return SelectByIds[T, K](ids)
+func (service CommonDao[T]) ListByIds(ids []any) ([]*T, *gorm.DB) {
+	return SelectByIds[T](ids)
 }
 
-func (service CommonDao[T, K]) PageAll(page *Page[T]) (*Page[T], *gorm.DB) {
+func (service CommonDao[T]) PageAll(page *Page[T]) (*Page[T], *gorm.DB) {
 	return SelectPage[T](page, nil)
 }
 
-func (service CommonDao[T, K]) Page(page *Page[T], q *Query[T]) (*Page[T], *gorm.DB) {
+func (service CommonDao[T]) Page(page *Page[T], q *Query[T]) (*Page[T], *gorm.DB) {
 	return SelectPage[T](page, q)
 }
 
-func (service CommonDao[T, K]) CountAll() (int64, *gorm.DB) {
+func (service CommonDao[T]) CountAll() (int64, *gorm.DB) {
 	return SelectCount[T](nil)
 }
 
-func (service CommonDao[T, K]) Count(q *Query[T]) (int64, *gorm.DB) {
+func (service CommonDao[T]) Count(q *Query[T]) (int64, *gorm.DB) {
 	return SelectCount[T](q)
 }

gplus/query.go

@@ -112,12 +112,12 @@ func (q *Query[T]) IsNotNull(column string) *Query[T] {
 	return q
 }
 
-func (q *Query[T]) In(column string, val ...any) *Query[T] {
+func (q *Query[T]) In(column string, val any) *Query[T] {
 	q.addCond(column, val, constants.In)
 	return q
 }
 
-func (q *Query[T]) NotIn(column string, val ...any) *Query[T] {
+func (q *Query[T]) NotIn(column string, val any) *Query[T] {
 	q.addCond(column, val, constants.Not+" "+constants.In)
 	return q
 }