Merge branch 'bq/previous-version' of github.com:coder/coder into bq/previous-version

BrunoQuaresma · BrunoQuaresma · commit f7a84f2f5d8a · 2022-12-05T17:43:12.000Z
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -1739,7 +1739,7 @@ func (q *fakeQuerier) GetPreviousTemplateVersion(_ context.Context, arg database
 
 	previousTemplateVersions := make([]database.TemplateVersion, 0)
 	for _, templateVersion := range q.templateVersions {
-		if templateVersion.ID == currentTemplateVersion.ID {
+		if templateVersion.ID == currentTemplateVersion.ID || templateVersion.OrganizationID != arg.OrganizationID || templateVersion.TemplateID != arg.TemplateID {
 			continue
 		}
 		if templateVersion.CreatedAt.Before(currentTemplateVersion.CreatedAt) {
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -649,7 +649,7 @@ func (api *API) previousTemplateVersionByOrganizationAndName(rw http.ResponseWri
 		Name:           templateVersionName,
 	})
 	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
+		if xerrors.Is(err, sql.ErrNoRows) {
 			httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
 				Message: fmt.Sprintf("No template version found by name %q.", templateVersionName),
 			})
@@ -670,7 +670,7 @@ func (api *API) previousTemplateVersionByOrganizationAndName(rw http.ResponseWri
 	})
 
 	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
+		if xerrors.Is(err, sql.ErrNoRows) {
 			httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
 				Message: fmt.Sprintf("No previous template version found for %q.", templateVersionName),
 			})

Original file line number	Diff line number	Diff line change
`@@ -1739,7 +1739,7 @@ func (q *fakeQuerier) GetPreviousTemplateVersion(_ context.Context, arg database`
`1739`	`1739`
`1740`	`1740`	`previousTemplateVersions := make([]database.TemplateVersion, 0)`
`1741`	`1741`	`for _, templateVersion := range q.templateVersions {`
`1742`		`- if templateVersion.ID == currentTemplateVersion.ID {`
	`1742`	`+ if templateVersion.ID == currentTemplateVersion.ID \|\| templateVersion.OrganizationID != arg.OrganizationID \|\| templateVersion.TemplateID != arg.TemplateID {`
`1743`	`1743`	`continue`
`1744`	`1744`	`}`
`1745`	`1745`	`if templateVersion.CreatedAt.Before(currentTemplateVersion.CreatedAt) {`