Fix leftover department references after rename to position
FindAll search query and tests still referenced the old column name, causing vet errors and runtime SQL failures. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -117,14 +117,14 @@ func (s *EmployeeSerialsService) FindAll(page int, limit int, search string) ([]
|
|||||||
|
|
||||||
// 搜索条件
|
// 搜索条件
|
||||||
if search != "" {
|
if search != "" {
|
||||||
db = db.Where("serial_number LIKE ? OR company_name LIKE ? OR department LIKE ? OR employee_name LIKE ?",
|
db = db.Where("serial_number LIKE ? OR company_name LIKE ? OR position LIKE ? OR employee_name LIKE ?",
|
||||||
"%"+search+"%", "%"+search+"%", "%"+search+"%", "%"+search+"%")
|
"%"+search+"%", "%"+search+"%", "%"+search+"%", "%"+search+"%")
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取总数
|
// 获取总数
|
||||||
countQuery := db.Model(&models.EmployeeSerial{})
|
countQuery := db.Model(&models.EmployeeSerial{})
|
||||||
if search != "" {
|
if search != "" {
|
||||||
countQuery = countQuery.Where("serial_number LIKE ? OR company_name LIKE ? OR department LIKE ? OR employee_name LIKE ?",
|
countQuery = countQuery.Where("serial_number LIKE ? OR company_name LIKE ? OR position LIKE ? OR employee_name LIKE ?",
|
||||||
"%"+search+"%", "%"+search+"%", "%"+search+"%", "%"+search+"%")
|
"%"+search+"%", "%"+search+"%", "%"+search+"%", "%"+search+"%")
|
||||||
}
|
}
|
||||||
countQuery.Count(&total)
|
countQuery.Count(&total)
|
||||||
|
|||||||
+15
-15
@@ -429,13 +429,13 @@ func TestEmployeeSerialsService_Generate_Success(t *testing.T) {
|
|||||||
database.DB.Create(&user)
|
database.DB.Create(&user)
|
||||||
|
|
||||||
service := EmployeeSerialsService{}
|
service := EmployeeSerialsService{}
|
||||||
serials, err := service.Generate("EmpTestCompany", "技术部", "张三", 5, user.ID)
|
serials, err := service.Generate("EmpTestCompany", "技术部", "张三", 5, user.ID, "")
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Len(t, serials, 5)
|
assert.Len(t, serials, 5)
|
||||||
for _, serial := range serials {
|
for _, serial := range serials {
|
||||||
assert.Equal(t, "EmpTestCompany", serial.CompanyName)
|
assert.Equal(t, "EmpTestCompany", serial.CompanyName)
|
||||||
assert.Equal(t, "技术部", serial.Department)
|
assert.Equal(t, "技术部", serial.Position)
|
||||||
assert.Equal(t, "张三", serial.EmployeeName)
|
assert.Equal(t, "张三", serial.EmployeeName)
|
||||||
assert.True(t, serial.IsActive)
|
assert.True(t, serial.IsActive)
|
||||||
assert.True(t, strings.HasPrefix(serial.SerialNumber, "EMP"))
|
assert.True(t, strings.HasPrefix(serial.SerialNumber, "EMP"))
|
||||||
@@ -459,7 +459,7 @@ func TestEmployeeSerialsService_Generate_CreateNewCompany(t *testing.T) {
|
|||||||
database.DB.Create(&user)
|
database.DB.Create(&user)
|
||||||
|
|
||||||
service := EmployeeSerialsService{}
|
service := EmployeeSerialsService{}
|
||||||
serials, err := service.Generate("NewEmpCompany", "市场部", "李四", 3, user.ID)
|
serials, err := service.Generate("NewEmpCompany", "市场部", "李四", 3, user.ID, "")
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Len(t, serials, 3)
|
assert.Len(t, serials, 3)
|
||||||
@@ -490,7 +490,7 @@ func TestEmployeeSerialsService_Query_Success(t *testing.T) {
|
|||||||
database.DB.Create(&user)
|
database.DB.Create(&user)
|
||||||
|
|
||||||
service := EmployeeSerialsService{}
|
service := EmployeeSerialsService{}
|
||||||
serials, _ := service.Generate("QueryEmpCompany", "财务部", "王五", 1, user.ID)
|
serials, _ := service.Generate("QueryEmpCompany", "财务部", "王五", 1, user.ID, "")
|
||||||
|
|
||||||
serialNumber := serials[0].SerialNumber
|
serialNumber := serials[0].SerialNumber
|
||||||
result, err := service.Query(serialNumber)
|
result, err := service.Query(serialNumber)
|
||||||
@@ -499,7 +499,7 @@ func TestEmployeeSerialsService_Query_Success(t *testing.T) {
|
|||||||
assert.NotNil(t, result)
|
assert.NotNil(t, result)
|
||||||
assert.Equal(t, strings.ToUpper(serialNumber), strings.ToUpper(result.SerialNumber))
|
assert.Equal(t, strings.ToUpper(serialNumber), strings.ToUpper(result.SerialNumber))
|
||||||
assert.Equal(t, "QueryEmpCompany", result.CompanyName)
|
assert.Equal(t, "QueryEmpCompany", result.CompanyName)
|
||||||
assert.Equal(t, "财务部", result.Department)
|
assert.Equal(t, "财务部", result.Position)
|
||||||
assert.Equal(t, "王五", result.EmployeeName)
|
assert.Equal(t, "王五", result.EmployeeName)
|
||||||
assert.True(t, result.IsActive)
|
assert.True(t, result.IsActive)
|
||||||
|
|
||||||
@@ -531,7 +531,7 @@ func TestEmployeeSerialsService_FindAll_Success(t *testing.T) {
|
|||||||
database.DB.Create(&user)
|
database.DB.Create(&user)
|
||||||
|
|
||||||
service := EmployeeSerialsService{}
|
service := EmployeeSerialsService{}
|
||||||
serials, _ := service.Generate("ListEmpCompany", "人事部", "赵六", 10, user.ID)
|
serials, _ := service.Generate("ListEmpCompany", "人事部", "赵六", 10, user.ID, "")
|
||||||
|
|
||||||
result, total, totalPages, err := service.FindAll(1, 5, "")
|
result, total, totalPages, err := service.FindAll(1, 5, "")
|
||||||
|
|
||||||
@@ -560,7 +560,7 @@ func TestEmployeeSerialsService_FindAll_WithSearch(t *testing.T) {
|
|||||||
database.DB.Create(&user)
|
database.DB.Create(&user)
|
||||||
|
|
||||||
service := EmployeeSerialsService{}
|
service := EmployeeSerialsService{}
|
||||||
serials, _ := service.Generate("SearchEmpCompany", "研发部", "钱七", 5, user.ID)
|
serials, _ := service.Generate("SearchEmpCompany", "研发部", "钱七", 5, user.ID, "")
|
||||||
|
|
||||||
result, _, _, err := service.FindAll(1, 10, "SearchEmpCompany")
|
result, _, _, err := service.FindAll(1, 10, "SearchEmpCompany")
|
||||||
|
|
||||||
@@ -596,14 +596,14 @@ func TestEmployeeSerialsService_Update_Success(t *testing.T) {
|
|||||||
database.DB.Create(&user)
|
database.DB.Create(&user)
|
||||||
|
|
||||||
service := EmployeeSerialsService{}
|
service := EmployeeSerialsService{}
|
||||||
serials, _ := service.Generate("UpdateEmpCompany", "运营部", "孙八", 1, user.ID)
|
serials, _ := service.Generate("UpdateEmpCompany", "运营部", "孙八", 1, user.ID, "")
|
||||||
|
|
||||||
serialNumber := serials[0].SerialNumber
|
serialNumber := serials[0].SerialNumber
|
||||||
isActive := false
|
isActive := false
|
||||||
|
|
||||||
updateData := models.UpdateEmployeeSerialDTO{
|
updateData := models.UpdateEmployeeSerialDTO{
|
||||||
CompanyName: "UpdatedEmpCompany",
|
CompanyName: "UpdatedEmpCompany",
|
||||||
Department: "新部门",
|
Position: "新部门",
|
||||||
EmployeeName: "新名字",
|
EmployeeName: "新名字",
|
||||||
IsActive: &isActive,
|
IsActive: &isActive,
|
||||||
}
|
}
|
||||||
@@ -613,7 +613,7 @@ func TestEmployeeSerialsService_Update_Success(t *testing.T) {
|
|||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.NotNil(t, result)
|
assert.NotNil(t, result)
|
||||||
assert.Equal(t, "UpdatedEmpCompany", result.CompanyName)
|
assert.Equal(t, "UpdatedEmpCompany", result.CompanyName)
|
||||||
assert.Equal(t, "新部门", result.Department)
|
assert.Equal(t, "新部门", result.Position)
|
||||||
assert.Equal(t, "新名字", result.EmployeeName)
|
assert.Equal(t, "新名字", result.EmployeeName)
|
||||||
assert.False(t, result.IsActive)
|
assert.False(t, result.IsActive)
|
||||||
|
|
||||||
@@ -650,7 +650,7 @@ func TestEmployeeSerialsService_Revoke_Success(t *testing.T) {
|
|||||||
database.DB.Create(&user)
|
database.DB.Create(&user)
|
||||||
|
|
||||||
service := EmployeeSerialsService{}
|
service := EmployeeSerialsService{}
|
||||||
serials, _ := service.Generate("RevokeEmpCompany", "测试部", "周九", 1, user.ID)
|
serials, _ := service.Generate("RevokeEmpCompany", "测试部", "周九", 1, user.ID, "")
|
||||||
|
|
||||||
serialNumber := serials[0].SerialNumber
|
serialNumber := serials[0].SerialNumber
|
||||||
err := service.Revoke(serialNumber)
|
err := service.Revoke(serialNumber)
|
||||||
@@ -689,7 +689,7 @@ func TestEmployeeSerialsService_Revoke_AlreadyRevoked(t *testing.T) {
|
|||||||
database.DB.Create(&user)
|
database.DB.Create(&user)
|
||||||
|
|
||||||
service := EmployeeSerialsService{}
|
service := EmployeeSerialsService{}
|
||||||
serials, _ := service.Generate("RevokeEmpCompany2", "行政部", "吴十", 1, user.ID)
|
serials, _ := service.Generate("RevokeEmpCompany2", "行政部", "吴十", 1, user.ID, "")
|
||||||
|
|
||||||
serialNumber := serials[0].SerialNumber
|
serialNumber := serials[0].SerialNumber
|
||||||
service.Revoke(serialNumber)
|
service.Revoke(serialNumber)
|
||||||
@@ -718,7 +718,7 @@ func TestEmployeeSerialsService_GenerateQRCode_Success(t *testing.T) {
|
|||||||
database.DB.Create(&user)
|
database.DB.Create(&user)
|
||||||
|
|
||||||
service := EmployeeSerialsService{}
|
service := EmployeeSerialsService{}
|
||||||
serials, _ := service.Generate("QREmpCompany", "产品部", "郑十一", 1, user.ID)
|
serials, _ := service.Generate("QREmpCompany", "产品部", "郑十一", 1, user.ID, "")
|
||||||
|
|
||||||
serialNumber := serials[0].SerialNumber
|
serialNumber := serials[0].SerialNumber
|
||||||
qrCodeBase64, queryUrl, err := service.GenerateQRCode(serialNumber, "", "localhost:3000", "http")
|
qrCodeBase64, queryUrl, err := service.GenerateQRCode(serialNumber, "", "localhost:3000", "http")
|
||||||
@@ -757,7 +757,7 @@ func TestEmployeeSerialsService_GenerateQRCode_Inactive(t *testing.T) {
|
|||||||
database.DB.Create(&user)
|
database.DB.Create(&user)
|
||||||
|
|
||||||
service := EmployeeSerialsService{}
|
service := EmployeeSerialsService{}
|
||||||
serials, _ := service.Generate("QREmpCompany2", "设计部", "王十二", 1, user.ID)
|
serials, _ := service.Generate("QREmpCompany2", "设计部", "王十二", 1, user.ID, "")
|
||||||
|
|
||||||
serialNumber := serials[0].SerialNumber
|
serialNumber := serials[0].SerialNumber
|
||||||
service.Revoke(serialNumber)
|
service.Revoke(serialNumber)
|
||||||
@@ -790,7 +790,7 @@ func TestCompaniesService_GetStatsOverview_Success(t *testing.T) {
|
|||||||
companySerials, _ := serialService.Generate("StatsCompany", 2, 30, user.ID, "STAT")
|
companySerials, _ := serialService.Generate("StatsCompany", 2, 30, user.ID, "STAT")
|
||||||
|
|
||||||
employeeSerialsService := EmployeeSerialsService{}
|
employeeSerialsService := EmployeeSerialsService{}
|
||||||
employeeSerials, _ := employeeSerialsService.Generate("StatsCompany", "技术部", "测试员工", 2, user.ID)
|
employeeSerials, _ := employeeSerialsService.Generate("StatsCompany", "技术部", "测试员工", 2, user.ID, "")
|
||||||
|
|
||||||
_ = serialService.Revoke(companySerials[0].SerialNumber)
|
_ = serialService.Revoke(companySerials[0].SerialNumber)
|
||||||
_ = employeeSerialsService.Revoke(employeeSerials[0].SerialNumber)
|
_ = employeeSerialsService.Revoke(employeeSerials[0].SerialNumber)
|
||||||
|
|||||||
Reference in New Issue
Block a user