prepare for better stats

This commit is contained in:
2021-07-26 16:38:12 +02:00
parent 6001f1b847
commit 9fc18e7867
9 changed files with 34 additions and 61 deletions

View File

@@ -62,6 +62,8 @@ func ValidColumn(column string) bool {
var (
// PkgbaseValidator is a validator for the "pkgbase" field. It is called by the builders before save.
PkgbaseValidator func(string) error
// DefaultStatus holds the default value on creation for the "status" field.
DefaultStatus int
// StatusValidator is a validator for the "status" field. It is called by the builders before save.
StatusValidator func(int) error
// RepositoryValidator is a validator for the "repository" field. It is called by the builders before save.

View File

@@ -363,20 +363,6 @@ func StatusLTE(v int) predicate.DbPackage {
})
}
// StatusIsNil applies the IsNil predicate on the "status" field.
func StatusIsNil() predicate.DbPackage {
return predicate.DbPackage(func(s *sql.Selector) {
s.Where(sql.IsNull(s.C(FieldStatus)))
})
}
// StatusNotNil applies the NotNil predicate on the "status" field.
func StatusNotNil() predicate.DbPackage {
return predicate.DbPackage(func(s *sql.Selector) {
s.Where(sql.NotNull(s.C(FieldStatus)))
})
}
// SkipReasonEQ applies the EQ predicate on the "skip_reason" field.
func SkipReasonEQ(v string) predicate.DbPackage {
return predicate.DbPackage(func(s *sql.Selector) {

View File

@@ -153,6 +153,7 @@ func (dpc *DbPackageCreate) Save(ctx context.Context) (*DbPackage, error) {
err error
node *DbPackage
)
dpc.defaults()
if len(dpc.hooks) == 0 {
if err = dpc.check(); err != nil {
return nil, err
@@ -191,6 +192,14 @@ func (dpc *DbPackageCreate) SaveX(ctx context.Context) *DbPackage {
return v
}
// defaults sets the default values of the builder before save.
func (dpc *DbPackageCreate) defaults() {
if _, ok := dpc.mutation.Status(); !ok {
v := dbpackage.DefaultStatus
dpc.mutation.SetStatus(v)
}
}
// check runs all checks and user-defined validators on the builder.
func (dpc *DbPackageCreate) check() error {
if _, ok := dpc.mutation.Pkgbase(); !ok {
@@ -201,6 +210,9 @@ func (dpc *DbPackageCreate) check() error {
return &ValidationError{Name: "pkgbase", err: fmt.Errorf("ent: validator failed for field \"pkgbase\": %w", err)}
}
}
if _, ok := dpc.mutation.Status(); !ok {
return &ValidationError{Name: "status", err: errors.New("ent: missing required field \"status\"")}
}
if v, ok := dpc.mutation.Status(); ok {
if err := dbpackage.StatusValidator(v); err != nil {
return &ValidationError{Name: "status", err: fmt.Errorf("ent: validator failed for field \"status\": %w", err)}
@@ -359,6 +371,7 @@ func (dpcb *DbPackageCreateBulk) Save(ctx context.Context) ([]*DbPackage, error)
for i := range dpcb.builders {
func(i int, root context.Context) {
builder := dpcb.builders[i]
builder.defaults()
var mut Mutator = MutateFunc(func(ctx context.Context, m Mutation) (Value, error) {
mutation, ok := m.(*DbPackageMutation)
if !ok {

View File

@@ -60,12 +60,6 @@ func (dpu *DbPackageUpdate) AddStatus(i int) *DbPackageUpdate {
return dpu
}
// ClearStatus clears the value of the "status" field.
func (dpu *DbPackageUpdate) ClearStatus() *DbPackageUpdate {
dpu.mutation.ClearStatus()
return dpu
}
// SetSkipReason sets the "skip_reason" field.
func (dpu *DbPackageUpdate) SetSkipReason(s string) *DbPackageUpdate {
dpu.mutation.SetSkipReason(s)
@@ -337,12 +331,6 @@ func (dpu *DbPackageUpdate) sqlSave(ctx context.Context) (n int, err error) {
Column: dbpackage.FieldStatus,
})
}
if dpu.mutation.StatusCleared() {
_spec.Fields.Clear = append(_spec.Fields.Clear, &sqlgraph.FieldSpec{
Type: field.TypeInt,
Column: dbpackage.FieldStatus,
})
}
if value, ok := dpu.mutation.SkipReason(); ok {
_spec.Fields.Set = append(_spec.Fields.Set, &sqlgraph.FieldSpec{
Type: field.TypeString,
@@ -494,12 +482,6 @@ func (dpuo *DbPackageUpdateOne) AddStatus(i int) *DbPackageUpdateOne {
return dpuo
}
// ClearStatus clears the value of the "status" field.
func (dpuo *DbPackageUpdateOne) ClearStatus() *DbPackageUpdateOne {
dpuo.mutation.ClearStatus()
return dpuo
}
// SetSkipReason sets the "skip_reason" field.
func (dpuo *DbPackageUpdateOne) SetSkipReason(s string) *DbPackageUpdateOne {
dpuo.mutation.SetSkipReason(s)
@@ -795,12 +777,6 @@ func (dpuo *DbPackageUpdateOne) sqlSave(ctx context.Context) (_node *DbPackage,
Column: dbpackage.FieldStatus,
})
}
if dpuo.mutation.StatusCleared() {
_spec.Fields.Clear = append(_spec.Fields.Clear, &sqlgraph.FieldSpec{
Type: field.TypeInt,
Column: dbpackage.FieldStatus,
})
}
if value, ok := dpuo.mutation.SkipReason(); ok {
_spec.Fields.Set = append(_spec.Fields.Set, &sqlgraph.FieldSpec{
Type: field.TypeString,

View File

@@ -13,7 +13,7 @@ var (
{Name: "id", Type: field.TypeInt, Increment: true},
{Name: "pkgbase", Type: field.TypeString, Unique: true},
{Name: "packages", Type: field.TypeJSON, Nullable: true},
{Name: "status", Type: field.TypeInt, Nullable: true},
{Name: "status", Type: field.TypeInt, Default: 6},
{Name: "skip_reason", Type: field.TypeString, Nullable: true},
{Name: "repository", Type: field.TypeString},
{Name: "march", Type: field.TypeString},

View File

@@ -265,24 +265,10 @@ func (m *DbPackageMutation) AddedStatus() (r int, exists bool) {
return *v, true
}
// ClearStatus clears the value of the "status" field.
func (m *DbPackageMutation) ClearStatus() {
m.status = nil
m.addstatus = nil
m.clearedFields[dbpackage.FieldStatus] = struct{}{}
}
// StatusCleared returns if the "status" field was cleared in this mutation.
func (m *DbPackageMutation) StatusCleared() bool {
_, ok := m.clearedFields[dbpackage.FieldStatus]
return ok
}
// ResetStatus resets all changes to the "status" field.
func (m *DbPackageMutation) ResetStatus() {
m.status = nil
m.addstatus = nil
delete(m.clearedFields, dbpackage.FieldStatus)
}
// SetSkipReason sets the "skip_reason" field.
@@ -927,9 +913,6 @@ func (m *DbPackageMutation) ClearedFields() []string {
if m.FieldCleared(dbpackage.FieldPackages) {
fields = append(fields, dbpackage.FieldPackages)
}
if m.FieldCleared(dbpackage.FieldStatus) {
fields = append(fields, dbpackage.FieldStatus)
}
if m.FieldCleared(dbpackage.FieldSkipReason) {
fields = append(fields, dbpackage.FieldSkipReason)
}
@@ -965,9 +948,6 @@ func (m *DbPackageMutation) ClearField(name string) error {
case dbpackage.FieldPackages:
m.ClearPackages()
return nil
case dbpackage.FieldStatus:
m.ClearStatus()
return nil
case dbpackage.FieldSkipReason:
m.ClearSkipReason()
return nil

View File

@@ -19,6 +19,8 @@ func init() {
dbpackage.PkgbaseValidator = dbpackageDescPkgbase.Validators[0].(func(string) error)
// dbpackageDescStatus is the schema descriptor for status field.
dbpackageDescStatus := dbpackageFields[2].Descriptor()
// dbpackage.DefaultStatus holds the default value on creation for the status field.
dbpackage.DefaultStatus = dbpackageDescStatus.Default.(int)
// dbpackage.StatusValidator is a validator for the "status" field. It is called by the builders before save.
dbpackage.StatusValidator = dbpackageDescStatus.Validators[0].(func(int) error)
// dbpackageDescRepository is the schema descriptor for repository field.

View File

@@ -15,7 +15,7 @@ func (DbPackage) Fields() []ent.Field {
return []ent.Field{
field.String("pkgbase").NotEmpty().Immutable().Unique(),
field.Strings("packages").Optional(),
field.Int("status").Optional().Min(0),
field.Int("status").Min(0).Default(6),
field.String("skip_reason").Optional(),
field.String("repository").NotEmpty(),
field.String("march").NotEmpty(),