Add indexes to new project files (#234)

* Order files by index

* Add index to new project files

* Add index to new project files

* Add index to new project files

Author: DylanTinianov

controller/projects.go

@@ -81,32 +81,35 @@ func (p *Projects) Create(user *model.User, input model.NewProject) (*model.Proj
 
 	files := make([]*model.File, 0)
 
-	for _, tpl := range input.ContractTemplates {
+	for i, tpl := range input.ContractTemplates {
 		files = append(files, &model.File{
 			ID:        uuid.New(),
 			ProjectID: proj.ID,
 			Title:     tpl.Title,
 			Script:    tpl.Script,
+			Index:     i,
 			Type:      model.ContractFile,
 		})
 	}
 
-	for _, tpl := range input.TransactionTemplates {
+	for i, tpl := range input.TransactionTemplates {
 		files = append(files, &model.File{
 			ID:        uuid.New(),
 			ProjectID: proj.ID,
 			Title:     tpl.Title,
 			Script:    tpl.Script,
+			Index:     i,
 			Type:      model.TransactionFile,
 		})
 	}
 
-	for _, tpl := range input.ScriptTemplates {
+	for i, tpl := range input.ScriptTemplates {
 		files = append(files, &model.File{
 			ID:        uuid.New(),
 			ProjectID: proj.ID,
 			Title:     tpl.Title,
 			Script:    tpl.Script,
+			Index:     i,
 			Type:      model.ScriptFile,
 		})
 	}

e2eTest/constants.go

@@ -189,6 +189,7 @@ query($projectId: UUID!) {
     id
     contractTemplates {
       id
+      title
       script
       index
     }
@@ -201,6 +202,7 @@ type GetProjectContractTemplatesResponse struct {
 		ID                string
 		ContractTemplates []struct {
 			ID     string
+			Title  string
 			Script string
 			Index  int
 		}
@@ -343,6 +345,17 @@ mutation($templateId: UUID!, $projectId: UUID!, $script: String!) {
 }
 `
 
+const MutationUpdateContractTemplateTitle = `
+mutation($templateId: UUID!, $projectId: UUID!, $title: String) {
+  updateContractTemplate(input: { id: $templateId, projectId: $projectId, title: $title }) {
+    id
+	title
+    script
+    index
+  }
+}
+`
+
 const MutationUpdateContractTemplateIndex = `
 mutation($templateId: UUID!, $projectId: UUID!, $index: Int!) {
   updateContractTemplate(input: { id: $templateId, projectId: $projectId, index: $index }) {
@@ -356,8 +369,9 @@ mutation($templateId: UUID!, $projectId: UUID!, $index: Int!) {
 type UpdateContractTemplateResponse struct {
 	UpdateContractTemplate struct {
 		ID     string
-		Script string
 		Index  int
+		Title  string
+		Script string
 	}
 }
 

e2eTest/contract_templates_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"strconv"
 	"testing"
 )
 
@@ -208,6 +209,66 @@ func TestContractTemplates(t *testing.T) {
 		assert.Equal(t, respB.UpdateContractTemplate.Script, respC.UpdateContractTemplate.Script)
 	})
 
+	t.Run("Test same contract ordering after updating", func(t *testing.T) {
+		c := newClient()
+
+		project := createProject(t, c)
+
+		var index4ID string
+
+		// Create 5 contracts
+		for i := 1; i <= 5; i++ {
+			var respA CreateContractTemplateResponse
+			err := c.Post(
+				MutationCreateContractTemplate,
+				&respA,
+				client.Var("projectId", project.ID),
+				client.Var("title", "Contract "+strconv.Itoa(i)),
+				client.Var("script", "apple"),
+				client.AddCookie(c.SessionCookie()),
+			)
+			require.NoError(t, err)
+
+			if i == 4 {
+				index4ID = respA.CreateContractTemplate.ID
+			}
+		}
+
+		var respC UpdateContractTemplateResponse
+		err := c.Post(
+			MutationUpdateContractTemplateTitle,
+			&respC,
+			client.Var("templateId", index4ID),
+			client.Var("projectId", project.ID),
+			client.Var("title", "Test Contract"),
+			client.AddCookie(c.SessionCookie()),
+		)
+		require.NoError(t, err)
+
+		var respD UpdateContractTemplateResponse
+		err = c.Post(
+			MutationUpdateContractTemplateScript,
+			&respD,
+			client.Var("templateId", index4ID),
+			client.Var("projectId", project.ID),
+			client.Var("script", "Contract5"),
+			client.AddCookie(c.SessionCookie()),
+		)
+		require.NoError(t, err)
+
+		var templatesResp GetProjectContractTemplatesResponse
+		err = c.Post(
+			QueryGetProjectContractTemplates,
+			&templatesResp,
+			client.Var("projectId", project.ID),
+			client.AddCookie(c.SessionCookie()),
+		)
+		require.NoError(t, err)
+
+		// Assert the ordering is correct
+		assert.Equal(t, "Test Contract", templatesResp.Project.ContractTemplates[3].Title)
+	})
+
 	t.Run("Update non-existent contract template", func(t *testing.T) {
 		c := newClient()
 

storage/sql.go

@@ -491,8 +491,8 @@ func (s *SQL) InsertTransactionExecution(exe *model.TransactionExecution) error
 
 func (s *SQL) GetTransactionExecutionsForProject(projectID uuid.UUID, exes *[]*model.TransactionExecution) error {
 	return s.db.Where(&model.TransactionExecution{File: model.File{ProjectID: projectID}}).
-		Order("\"index\" asc").
 		Find(exes).
+		Order("\"index\" asc").
 		Error
 }