This repository has been archived by the owner on Mar 11, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 86
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Assign number to new areas/iterations and allow searching by it (#2311)
Existing iterations and areas are not touched and won't have a number assigned to them. This will come in a later change. This is a code-only change to proof that it is backwards compatible. See https://openshift.io/openshiftio/Openshift_io/plan/detail/618 Most of the code in this change comes from this PR which was later revered: #2311
- Loading branch information
Showing
27 changed files
with
434 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| package numbersequence | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/fabric8-services/fabric8-wit/convert" | ||
| "github.com/fabric8-services/fabric8-wit/log" | ||
| "github.com/jinzhu/gorm" | ||
| errs "github.com/pkg/errors" | ||
| uuid "github.com/satori/go.uuid" | ||
| ) | ||
|
|
||
| // The HumanFriendlyNumber struct can be embedded in all model structs that want | ||
| // to have an automatically incremented human friendly number (1, 2, 3, 4, ...), | ||
| // Such a number is unique within the space and for the given table name (e.g. | ||
| // "work_items", "iterations", "areas"). Once a model has received a number | ||
| // during the creation phase (on database INSERT), any followup call to the | ||
| // model's `Save()` function will prohibit changing the number. | ||
| type HumanFriendlyNumber struct { | ||
| Number int `json:"number,omitempty"` | ||
| spaceID uuid.UUID `gorm:"-"` | ||
| tableName string `gorm:"-"` | ||
| } | ||
|
|
||
| // NewHumanFriendlyNumber TODO(kwk): document me | ||
| func NewHumanFriendlyNumber(spaceID uuid.UUID, tableName string, number ...int) HumanFriendlyNumber { | ||
| n := 0 | ||
| if len(number) > 0 { | ||
| n = number[0] | ||
| } | ||
| return HumanFriendlyNumber{ | ||
| Number: n, | ||
| spaceID: spaceID, | ||
| tableName: tableName, | ||
| } | ||
| } | ||
|
|
||
| // Ensure Equaler implements the Equaler interface | ||
| var _ convert.Equaler = HumanFriendlyNumber{} | ||
| var _ convert.Equaler = (*HumanFriendlyNumber)(nil) | ||
|
|
||
| // Equal implements convert.Equaler | ||
| func (n HumanFriendlyNumber) Equal(u convert.Equaler) bool { | ||
| other, ok := u.(HumanFriendlyNumber) | ||
| if !ok { | ||
| return false | ||
| } | ||
| if n.Number != other.Number { | ||
| return false | ||
| } | ||
| if n.spaceID != other.spaceID { | ||
| return false | ||
| } | ||
| if n.tableName != other.tableName { | ||
| return false | ||
| } | ||
| return true | ||
| } | ||
|
|
||
| // EqualValue implements convert.Equaler | ||
| func (n HumanFriendlyNumber) EqualValue(u convert.Equaler) bool { | ||
| return n.Equal(u) | ||
| } | ||
|
|
||
| // BeforeCreate is a GORM callback (see http://doc.gorm.io/callbacks.html) that | ||
| // will be called before creating the model. We use it to determine the next | ||
| // human readable number for the model and set it automatically in the CREATE | ||
| // query. | ||
| func (n *HumanFriendlyNumber) BeforeCreate(scope *gorm.Scope) error { | ||
| upsertStmt := ` | ||
| INSERT INTO number_sequences (space_id, table_name, current_val) | ||
| VALUES ($1, $2, 1) | ||
| ON CONFLICT (space_id, table_name) | ||
| DO UPDATE SET current_val = number_sequences.current_val + EXCLUDED.current_val | ||
| RETURNING current_val | ||
| ` | ||
| var currentVal int | ||
| err := scope.NewDB().Debug().CommonDB().QueryRow(upsertStmt, n.spaceID, n.tableName).Scan(¤tVal) | ||
| if err != nil { | ||
| return errs.Wrapf(err, "failed to obtain next val for space %q and table %q", n.spaceID, n.tableName) | ||
| } | ||
| log.Debug(nil, map[string]interface{}{ | ||
| "space_id": n.spaceID, | ||
| "table_name": n.tableName, | ||
| "next_val": currentVal, | ||
| }, "computed nextVal") | ||
|
|
||
| n.Number = currentVal | ||
| return scope.SetColumn("number", n.Number) | ||
| } | ||
|
|
||
| // BeforeUpdate is a GORM callback (see http://doc.gorm.io/callbacks.html) that | ||
| // will be called before updating the model. We use it to check for number | ||
| // compatibility by adding this condition to the WHERE clause of the UPDATE: | ||
| // | ||
| // AND number=<NUMBER-OF-THE-MODEL> | ||
| // | ||
| // This guarantees that you cannot change the number on the model when you | ||
| // update it. The UPDATE will affect no rows! | ||
| // | ||
| // NOTE(kwk): We could have used scope.Search.Omit("number") in order to avoid | ||
| // setting the number, but there is practically no way to tell back to the | ||
| // model, that we have ignored the number column. | ||
| func (n *HumanFriendlyNumber) BeforeUpdate(scope *gorm.Scope) error { | ||
| scope.Search.Where(fmt.Sprintf(`"%s"."number"=?`, scope.TableName()), n.Number) | ||
| return nil | ||
| } |
Oops, something went wrong.