Basic API works.

2020-05-08 15:54:40 +02:00
parent 6837e7b4c8
commit 564ac0d24a
36 changed files with 1450 additions and 80 deletions
@@ -13,12 +13,13 @@ import (
 )

 type DB struct {
-	db       *sqlx.DB
-	issues   *issueRepository
-	items    *itemRepository
-	projects *projectRepository
-	sessions *sessionRepository
-	users    *userRepository
+	db              *sqlx.DB
+	issues          *issueRepository
+	items           *itemRepository
+	projects        *projectRepository
+	sessions        *sessionRepository
+	users           *userRepository
+	projectStatuses *projectStatusRepository
 }

 func (db *DB) Issues() repositories.IssueRepository {
@@ -41,6 +42,10 @@ func (db *DB) Users() repositories.UserRepository {
 	return db.users
 }

+func (db *DB) ProjectStatuses() repositories.ProjectStatusRepository {
+	return db.projectStatuses
+}
+
 func (db *DB) Migrate() error {
 	err := goose.SetDialect("mysql")
 	if err != nil {
@@ -75,13 +80,17 @@ func Open(connectionString string) (*DB, error) {
 	items := &itemRepository{db: db}
 	projects := &projectRepository{db: db}
 	users := &userRepository{db: db}
+	sessions := &sessionRepository{db: db}
+	projectStatuses := &projectStatusRepository{db: db}

 	return &DB{
-		db:       db,
-		issues:   issues,
-		items:    items,
-		projects: projects,
-		users:    users,
+		db:              db,
+		issues:          issues,
+		items:           items,
+		projects:        projects,
+		users:           users,
+		sessions:        sessions,
+		projectStatuses: projectStatuses,
 	}, nil
 }

@@ -19,12 +19,13 @@ func TestMain(m *testing.M) {
 	for i := 0; i < 10; i++ {
 		db, err := Open(testDbConnect)
 		if err != nil {
-			log.Println("DB ERROR", err)
+			log.Println("DB ERROR", i, err)
 			time.Sleep(time.Second)
 			continue
 		}

 		testDB = db
+		break
 	}
 	if testDB == nil {
 		log.Println("DB FAILED")
@@ -89,6 +89,16 @@ func (r *projectRepository) Save(ctx context.Context, project models.Project) er
 	return err
 }

+func (r *projectRepository) ListPermissions(ctx context.Context, project models.Project) ([]*models.ProjectPermission, error) {
+	permissions := make([]*models.ProjectPermission, 0, 4)
+	err := r.db.SelectContext(ctx, &permissions, "SELECT * FROM project_permission WHERE project_id=?", project.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	return permissions, nil
+}
+
 func (r *projectRepository) GetPermission(ctx context.Context, project models.Project, user models.User) (*models.ProjectPermission, error) {
 	permission := models.ProjectPermission{}
 	err := r.db.GetContext(ctx, &permission, "SELECT * FROM project_permission WHERE project_id=? AND user_id=?", project.ID, user.ID)
@@ -0,0 +1,70 @@
+package mysqldriver
+
+import (
+	"context"
+	"database/sql"
+	"git.aiterp.net/stufflog/server/internal/xlerrors"
+	"git.aiterp.net/stufflog/server/models"
+	sq "github.com/Masterminds/squirrel"
+	"github.com/jmoiron/sqlx"
+)
+
+type projectStatusRepository struct {
+	db *sqlx.DB
+}
+
+func (r *projectStatusRepository) Find(ctx context.Context, projectID string, name string) (*models.ProjectStatus, error) {
+	projectStatus := models.ProjectStatus{}
+	err := r.db.GetContext(ctx, &projectStatus, "SELECT * FROM project_status WHERE project_id=? AND name=?", projectID, name)
+	if err != nil {
+		if err == sql.ErrNoRows {
+			return nil, xlerrors.NotFound("Project status")
+		}
+
+		return nil, err
+	}
+
+	return &projectStatus, nil
+}
+
+func (r *projectStatusRepository) List(ctx context.Context, filter models.ProjectStatusFilter) ([]*models.ProjectStatus, error) {
+	q := sq.Select("*").From("project_status")
+	if filter.ProjectID != nil {
+		q = q.Where(sq.Eq{"project_id": *filter.ProjectID})
+	}
+	if filter.MinStage != nil {
+		q = q.Where(sq.GtOrEq{"stage": *filter.MinStage})
+	}
+	if filter.MaxStage != nil {
+		q = q.Where(sq.LtOrEq{"stage": *filter.MaxStage})
+	}
+	q = q.OrderBy("project_id", "stage", "name")
+
+	query, args, err := q.ToSql()
+	if err != nil {
+		return nil, err
+	}
+
+	statuses := make([]*models.ProjectStatus, 0, 16)
+	err = r.db.SelectContext(ctx, &statuses, query, args...)
+	if err != nil {
+		return nil, err
+	}
+
+	return statuses, nil
+}
+
+func (r *projectStatusRepository) Save(ctx context.Context, status models.ProjectStatus) error {
+	_, err := r.db.NamedExecContext(ctx, `
+		REPLACE INTO project_status (project_id, name, stage, description)
+		VALUES (:project_id, :name, :stage, :description)
+	`, status)
+
+	return err
+}
+
+func (r *projectStatusRepository) Delete(ctx context.Context, status models.ProjectStatus) error {
+	_, err := r.db.ExecContext(ctx, "DELETE FROM project_status WHERE project_id=? AND name=?", status.ProjectID, status.Name)
+
+	return err
+}
@@ -0,0 +1,165 @@
+package mysqldriver
+
+import (
+	"context"
+	"git.aiterp.net/stufflog/server/internal/xlerrors"
+	"git.aiterp.net/stufflog/server/models"
+	"github.com/stretchr/testify/assert"
+	"testing"
+	"time"
+)
+
+var projectStatus1 = models.ProjectStatus{
+	ProjectID:   project1.ID,
+	Stage:       models.IssueStagePending,
+	Name:        "Ready",
+	Description: "This task is ready to be done.",
+}
+var projectStatus2 = models.ProjectStatus{
+	ProjectID:   project1.ID,
+	Stage:       models.IssueStageInactive,
+	Name:        "Idea",
+	Description: "Maybe do this?",
+}
+var projectStatus3 = models.ProjectStatus{
+	ProjectID:   project2.ID,
+	Stage:       models.IssueStageActive,
+	Name:        "In Progress",
+	Description: "It is being done.",
+}
+var projectStatus4 = models.ProjectStatus{
+	ProjectID:   project2.ID,
+	Stage:       models.IssueStageReview,
+	Name:        "Rendered",
+	Description: "It is rendered and awaiting feedback.",
+}
+var projectStatus5 = models.ProjectStatus{
+	ProjectID:   project3.ID,
+	Stage:       models.IssueStageCompleted,
+	Name:        "Om Nom Nom",
+	Description: "Sustenance intake complete.",
+}
+var projectStatus6 = models.ProjectStatus{
+	ProjectID:   project1.ID,
+	Stage:       models.IssueStageFailed,
+	Name:        "Bad Stuff",
+	Description: "Stuff could not be done.",
+}
+var projectStatus7 = models.ProjectStatus{
+	ProjectID:   project2.ID,
+	Stage:       models.IssueStagePostponed,
+	Name:        "Too Hard",
+	Description: "Do it later.",
+}
+var projectStatus7Updated = models.ProjectStatus{
+	ProjectID:   project2.ID,
+	Stage:       models.IssueStageInactive,
+	Name:        "Too Hard",
+	Description: "Do it later, when you're less of newbie.",
+}
+
+func TestProjectStatusRepository(t *testing.T) {
+	statuses := testDB.projectStatuses
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
+	defer cancel()
+
+	assert.NoError(t, clearTable("project_status"))
+
+	// INSERT
+	assert.NoError(t, statuses.Save(ctx, projectStatus1))
+	assert.NoError(t, statuses.Save(ctx, projectStatus2))
+	assert.NoError(t, statuses.Save(ctx, projectStatus3))
+	assert.NoError(t, statuses.Save(ctx, projectStatus4))
+	assert.NoError(t, statuses.Save(ctx, projectStatus5))
+	assert.NoError(t, statuses.Save(ctx, projectStatus6))
+	assert.NoError(t, statuses.Save(ctx, projectStatus7))
+
+	// FIND
+	result, err := statuses.Find(ctx, project2.ID, projectStatus3.Name)
+	assert.NoError(t, err)
+	assert.Equal(t, &projectStatus3, result)
+	result, err = statuses.Find(ctx, project1.ID, projectStatus6.Name)
+	assert.NoError(t, err)
+	assert.Equal(t, &projectStatus6, result)
+
+	// FINDn't
+	result, err = statuses.Find(ctx, project3.ID, projectStatus6.Name)
+	assert.Error(t, err)
+	assert.True(t, xlerrors.IsNotFound(err))
+	assert.Nil(t, result)
+	result, err = statuses.Find(ctx, project2.ID, "Non-existent Name")
+	assert.Error(t, err)
+	assert.True(t, xlerrors.IsNotFound(err))
+	assert.Nil(t, result)
+
+	// LIST
+	results, err := statuses.List(ctx, models.ProjectStatusFilter{})
+	assert.NoError(t, err)
+	assert.Equal(t, []*models.ProjectStatus{
+		&projectStatus5,
+		&projectStatus3,
+		&projectStatus4,
+		&projectStatus7,
+		&projectStatus2,
+		&projectStatus1,
+		&projectStatus6,
+	}, results)
+	results, err = statuses.List(ctx, models.ProjectStatusFilter{ProjectID: &project1.ID})
+	assert.NoError(t, err)
+	assert.Equal(t, []*models.ProjectStatus{
+		&projectStatus2,
+		&projectStatus1,
+		&projectStatus6,
+	}, results)
+	results, err = statuses.List(ctx, models.ProjectStatusFilter{ProjectID: &project2.ID, MinStage: ptrInt(models.IssueStageReview)})
+	assert.NoError(t, err)
+	assert.Equal(t, []*models.ProjectStatus{
+		&projectStatus4,
+		&projectStatus7,
+	}, results)
+	results, err = statuses.List(ctx, models.ProjectStatusFilter{ProjectID: &project2.ID, MaxStage: ptrInt(models.IssueStageReview)})
+	assert.NoError(t, err)
+	assert.Equal(t, []*models.ProjectStatus{
+		&projectStatus3,
+		&projectStatus4,
+	}, results)
+	results, err = statuses.List(ctx, models.ProjectStatusFilter{ProjectID: &project3.ID, MaxStage: ptrInt(models.IssueStagePending)})
+	assert.NoError(t, err)
+	assert.Equal(t, []*models.ProjectStatus{}, results)
+
+	// UPDATE
+	assert.NoError(t, statuses.Save(ctx, projectStatus7Updated))
+
+	// FIND after UPDATE
+	result, err = statuses.Find(ctx, project2.ID, projectStatus7.Name)
+	assert.NoError(t, err)
+	assert.Equal(t, &projectStatus7Updated, result)
+
+	// LIST after UPDATE
+	results, err = statuses.List(ctx, models.ProjectStatusFilter{})
+	assert.NoError(t, err)
+	assert.Equal(t, []*models.ProjectStatus{
+		&projectStatus5,
+		&projectStatus7Updated,
+		&projectStatus3,
+		&projectStatus4,
+		&projectStatus2,
+		&projectStatus1,
+		&projectStatus6,
+	}, results)
+
+	// DELETE
+	assert.NoError(t, statuses.Delete(ctx, projectStatus7Updated))
+
+	// LIST after DELETE
+	results, err = statuses.List(ctx, models.ProjectStatusFilter{})
+	assert.NoError(t, err)
+	assert.Equal(t, []*models.ProjectStatus{
+		&projectStatus5,
+		&projectStatus3,
+		&projectStatus4,
+		&projectStatus2,
+		&projectStatus1,
+		&projectStatus6,
+	}, results)
+}