Add route and test

coder · BrunoQuaresma · Dec 6, 2022 · Dec 1, 2022 · Dec 1, 2022 · Dec 1, 2022
commit 0d411a07eb039e98d98da3eac14acb5770c2bd99
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -343,6 +343,7 @@ func New(options *Options) *API {
 				r.Route("/templateversions", func(r chi.Router) {
 					r.Post("/", api.postTemplateVersionsByOrganization)
 					r.Get("/{templateversionname}", api.templateVersionByOrganizationAndName)
+					r.Get("/{templateversionname}/previous", api.previousTemplateVersionByOrganizationAndName)
 				})
 				r.Route("/templates", func(r chi.Router) {
 					r.Post("/", api.postTemplateByOrganization)

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -1717,7 +1717,7 @@ func (q *fakeQuerier) GetTemplateVersionByJobID(_ context.Context, jobID uuid.UU
 	return database.TemplateVersion{}, sql.ErrNoRows
 }
 
-func (q *fakeQuerier) GetPreviousTemplateVersionByID(_ context.Context, id uuid.UUID) (database.TemplateVersion, error) {
+func (q *fakeQuerier) GetPreviousTemplateVersionByOrganizationAndName(_ context.Context, arg database.GetPreviousTemplateVersionByOrganizationAndNameParams) (database.TemplateVersion, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
 
@@ -1728,7 +1728,10 @@ func (q *fakeQuerier) GetPreviousTemplateVersionByID(_ context.Context, id uuid.
 
 	var previousIndex = -1
 	for index, templateVersion := range templateVersions {
-		if templateVersion.ID != id {
+		if templateVersion.OrganizationID != arg.OrganizationID {
+			continue
+		}
+		if !strings.EqualFold(templateVersion.Name, arg.Name) {
 			continue
 		}
 		previousIndex = index - 1

diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templateversions.sql b/coderd/database/queries/templateversions.sql
@@ -111,12 +111,16 @@ SET
 WHERE
 	job_id = $1;
 
--- name: GetPreviousTemplateVersionByID :one
+-- name: GetPreviousTemplateVersionByOrganizationAndName :one
 SELECT
 	*
 FROM
 	template_versions
 WHERE
-	created_at < (SELECT created_at FROM template_versions WHERE template_versions.id = @id)
+	created_at < (
+		SELECT created_at
+		FROM template_versions as tv
+		WHERE tv.organization_id = $1 AND tv.name = $2
+	)
 ORDER BY created_at DESC
 LIMIT 1;
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -640,6 +640,48 @@ func (api *API) templateVersionByOrganizationAndName(rw http.ResponseWriter, r *
 	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(job), user))
 }
 
+func (api *API) previousTemplateVersionByOrganizationAndName(rw http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	organization := httpmw.OrganizationParam(r)
+	templateVersionName := chi.URLParam(r, "templateversionname")
+	templateVersion, err := api.Database.GetPreviousTemplateVersionByOrganizationAndName(ctx, database.GetPreviousTemplateVersionByOrganizationAndNameParams{
+		OrganizationID: organization.ID,
+		Name:           templateVersionName,
+	})
+	if errors.Is(err, sql.ErrNoRows) {
+		httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
+			Message: fmt.Sprintf("No previous template version found for name %q.", templateVersionName),
+		})
+		return
+	}
+	if err != nil {
+		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+			Message: "Internal error fetching the previous template version.",
+			Detail:  err.Error(),
+		})
+		return
+	}
+	job, err := api.Database.GetProvisionerJobByID(ctx, templateVersion.JobID)
+	if err != nil {
+		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+			Message: "Internal error fetching provisioner job.",
+			Detail:  err.Error(),
+		})
+		return
+	}
+
+	user, err := api.Database.GetUserByID(ctx, templateVersion.CreatedBy)
+	if err != nil {
+		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+			Message: "Internal error on fetching user.",
+			Detail:  err.Error(),
+		})
+		return
+	}
+
+	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(job), user))
+}
+
 func (api *API) patchActiveTemplateVersion(rw http.ResponseWriter, r *http.Request) {
 	var (
 		ctx               = r.Context()

diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go
@@ -963,3 +963,36 @@ func TestTemplateVersionByOrganizationAndName(t *testing.T) {
 		require.NoError(t, err)
 	})
 }
+
+func TestPreviousTemplateVersion(t *testing.T) {
+	t.Parallel()
+	t.Run("Not found", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		user := coderdtest.CreateFirstUser(t, client)
+		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		_, err := client.PreviousTemplateVersion(ctx, user.OrganizationID, version.Name)
+		var apiErr *codersdk.Error
+		require.ErrorAs(t, err, &apiErr)
+		require.Equal(t, http.StatusNotFound, apiErr.StatusCode())
+	})
+
+	t.Run("Found", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		user := coderdtest.CreateFirstUser(t, client)
+		previousVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
+		latestVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		_, err := client.PreviousTemplateVersion(ctx, user.OrganizationID, latestVersion.Name)
+		require.NoError(t, err)
+		require.Equal(t, previousVersion.ID, latestVersion.ID)
+	})
+}
diff --git a/codersdk/templateversions.go b/codersdk/templateversions.go
@@ -182,3 +182,16 @@ func (c *Client) CancelTemplateVersionDryRun(ctx context.Context, version, job u
 	}
 	return nil
 }
+
+func (c *Client) PreviousTemplateVersion(ctx context.Context, organization uuid.UUID, versionName string) (TemplateVersion, error) {
+	res, err := c.Request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s/templateversions/%s/previous", organization, versionName), nil)
+	if err != nil {
+		return TemplateVersion{}, err
+	}
+	defer res.Body.Close()
+	if res.StatusCode != http.StatusOK {
+		return TemplateVersion{}, readBodyAsError(res)
+	}
+	var version TemplateVersion
+	return version, json.NewDecoder(res.Body).Decode(&version)
+}