more db refactors

internal/db/role.go

@@ -127,7 +127,7 @@ func AddPermissionToRole(ctx context.Context, tx bun.Tx, roleID, permissionID in
 		PermissionID: permissionID,
 	}
 	err := Insert(tx, rolePerm).
-		On("CONFLICT (role_id, permission_id) DO NOTHING").
+		ConflictNothing("role_id", "permission_id").
 		Exec(ctx)
 	if err != nil {
 		return errors.Wrap(err, "db.Insert")
@@ -145,13 +145,12 @@ func RemovePermissionFromRole(ctx context.Context, tx bun.Tx, roleID, permission
 		return errors.New("permissionID must be positive")
 	}
 
-	_, err := tx.NewDelete().
-		Model((*RolePermission)(nil)).
+	err := DeleteItem[RolePermission](tx).
 		Where("role_id = ?", roleID).
 		Where("permission_id = ?", permissionID).
-		Exec(ctx)
+		Delete(ctx)
 	if err != nil {
-		return errors.Wrap(err, "tx.NewDelete")
+		return errors.Wrap(err, "DeleteItem")
 	}
 
 	return nil