stufflog/server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename internal package xlerrors -> slerrors.

Browse Source
This commit is contained in:
gisle
2020-05-15 10:02:43 +02:00
parent 14c9425ee7
commit 381cda1f8f
23 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database/drivers/mysqldriver/activities.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"database/sql"
"errors"
"git.aiterp.net/stufflog/server/internal/generate"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
sq "github.com/Masterminds/squirrel"
"github.com/jmoiron/sqlx"
@@ -20,7 +20,7 @@ func (r *activityRepository) Find(ctx context.Context, id string) (*models.Activ
err := r.db.GetContext(ctx, &activity, "SELECT * FROM activity WHERE activity_id=?", id)
if err != nil {
if err == sql.ErrNoRows {
return nil, xlerrors.NotFound("Activity")
return nil, slerrors.NotFound("Activity")
}
return nil, err
database/drivers/mysqldriver/issetasks.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"database/sql"
"errors"
"fmt"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
sq "github.com/Masterminds/squirrel"
"github.com/jmoiron/sqlx"
@@ -21,7 +21,7 @@ func (r *issueTaskRepository) Find(ctx context.Context, id string) (*models.Issu
err := r.db.GetContext(ctx, &issueTask, "SELECT * FROM issue_task WHERE issue_task_id=?", id)
if err != nil {
if err == sql.ErrNoRows {
return nil, xlerrors.NotFound("Issue task")
return nil, slerrors.NotFound("Issue task")
}
return nil, err
database/drivers/mysqldriver/issues.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"database/sql"
"errors"
"fmt"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
sq "github.com/Masterminds/squirrel"
"github.com/jmoiron/sqlx"
@@ -24,7 +24,7 @@ func (r *issueRepository) Find(ctx context.Context, id string) (*models.Issue, e
err := r.db.GetContext(ctx, &issue, "SELECT * FROM issue WHERE issue_id=?", id)
if err != nil {
if err == sql.ErrNoRows {
return nil, xlerrors.NotFound("Issue")
return nil, slerrors.NotFound("Issue")
}
return nil, err
database/drivers/mysqldriver/issues_test.go
+2 -2
View File
@@ -2,7 +2,7 @@ package mysqldriver
import (
"context"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
"github.com/stretchr/testify/assert"
"testing"
@@ -122,7 +122,7 @@ func TestIssueRepository(t *testing.T) {
result, err = issues.Find(ctx, "NONEXISTENT-666")
assert.Error(t, err)
assert.Nil(t, result)
assert.True(t, xlerrors.IsNotFound(err))
assert.True(t, slerrors.IsNotFound(err))
// LIST
results, err := issues.List(ctx, models.IssueFilter{})
database/drivers/mysqldriver/items.go
+2 -2
View File
@@ -4,7 +4,7 @@ import (
"context"
"database/sql"
"git.aiterp.net/stufflog/server/internal/generate"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
sq "github.com/Masterminds/squirrel"
"github.com/jmoiron/sqlx"
@@ -19,7 +19,7 @@ func (r *itemRepository) Find(ctx context.Context, id string) (*models.Item, err
err := r.db.GetContext(ctx, &item, "SELECT * FROM item WHERE item_id=?", id)
if err != nil {
if err == sql.ErrNoRows {
return nil, xlerrors.NotFound("Project")
return nil, slerrors.NotFound("Project")
}
return nil, err
database/drivers/mysqldriver/items_test.go
+2 -2
View File
@@ -2,7 +2,7 @@ package mysqldriver
import (
"context"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
"github.com/stretchr/testify/assert"
"testing"
@@ -93,7 +93,7 @@ func TestItemRepository(t *testing.T) {
// FIND't
result, err = items.Find(ctx, "Iobviouslyinvalidid")
assert.Error(t, err)
assert.True(t, xlerrors.IsNotFound(err))
assert.True(t, slerrors.IsNotFound(err))
assert.Nil(t, result)
// LIST
database/drivers/mysqldriver/projects.go
+2 -2
View File
@@ -4,7 +4,7 @@ import (
"context"
"database/sql"
"errors"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
sq "github.com/Masterminds/squirrel"
"github.com/jmoiron/sqlx"
@@ -19,7 +19,7 @@ func (r *projectRepository) Find(ctx context.Context, id string) (*models.Projec
err := r.db.GetContext(ctx, &project, "SELECT * FROM project WHERE project_id=?", id)
if err != nil {
if err == sql.ErrNoRows {
return nil, xlerrors.NotFound("Project")
return nil, slerrors.NotFound("Project")
}
return nil, err
database/drivers/mysqldriver/projects_test.go
+2 -2
View File
@@ -2,7 +2,7 @@ package mysqldriver
import (
"context"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
"github.com/stretchr/testify/assert"
"testing"
@@ -62,7 +62,7 @@ func TestProjectRepository(t *testing.T) {
// FIND't
result, err = projects.Find(ctx, "BLARGH")
assert.Error(t, err)
assert.True(t, xlerrors.IsNotFound(err))
assert.True(t, slerrors.IsNotFound(err))
assert.Nil(t, result)
// LIST
database/drivers/mysqldriver/projectstatuses.go
+2 -2
View File
@@ -3,7 +3,7 @@ package mysqldriver
import (
"context"
"database/sql"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
sq "github.com/Masterminds/squirrel"
"github.com/jmoiron/sqlx"
@@ -18,7 +18,7 @@ func (r *projectStatusRepository) Find(ctx context.Context, projectID string, na
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, slerrors.NotFound("Project status")
}
return nil, err
database/drivers/mysqldriver/projectstatuses_test.go
+3 -3
View File
@@ -2,7 +2,7 @@ package mysqldriver
import (
"context"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
"github.com/stretchr/testify/assert"
"testing"
@@ -85,11 +85,11 @@ func TestProjectStatusRepository(t *testing.T) {
// FINDn't
result, err = statuses.Find(ctx, project3.ID, projectStatus6.Name)
assert.Error(t, err)
assert.True(t, xlerrors.IsNotFound(err))
assert.True(t, slerrors.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.True(t, slerrors.IsNotFound(err))
assert.Nil(t, result)
// LIST
database/drivers/mysqldriver/session.go
+3 -3
View File
@@ -3,7 +3,7 @@ package mysqldriver
import (
"context"
"database/sql"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
"github.com/jmoiron/sqlx"
"time"
@@ -18,12 +18,12 @@ func (r *sessionRepository) Find(ctx context.Context, id string) (*models.Sessio
err := r.db.GetContext(ctx, &session, "SELECT * FROM session WHERE session_id=?", id)
if err != nil {
if err == sql.ErrNoRows {
return nil, xlerrors.NotFound("Session")
return nil, slerrors.NotFound("Session")
}
return nil, err
} else if time.Now().After(session.ExpiryTime) {
return nil, xlerrors.NotFound("Session")
return nil, slerrors.NotFound("Session")
}
return &session, nil
database/drivers/mysqldriver/users.go
+2 -2
View File
@@ -4,7 +4,7 @@ import (
"context"
"database/sql"
"errors"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
sq "github.com/Masterminds/squirrel"
"github.com/jmoiron/sqlx"
@@ -19,7 +19,7 @@ func (r *userRepository) Find(ctx context.Context, id string) (*models.User, err
err := r.db.GetContext(ctx, &user, "SELECT * FROM user WHERE user_id=?", id)
if err != nil {
if err == sql.ErrNoRows {
return nil, xlerrors.NotFound("User")
return nil, slerrors.NotFound("User")
}
return nil, err
database/drivers/mysqldriver/users_test.go
+2 -2
View File
@@ -2,7 +2,7 @@ package mysqldriver
import (
"context"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
"github.com/stretchr/testify/assert"
"testing"
@@ -59,7 +59,7 @@ func TestUserRepository(t *testing.T) {
// FIND't
result, err = users.Find(ctx, "NonExistent")
assert.Error(t, err)
assert.True(t, xlerrors.IsNotFound(err))
assert.True(t, slerrors.IsNotFound(err))
assert.Nil(t, result)
// LIST