第８回の課題（大倉）

interface/api/interfaces/controllers/user_controller_test.go

@@ -21,6 +21,7 @@ var (
 	mockID          = 2
 	userJSON        = `{"first_name":"John ","last_name":"Doe"}`
 	invalidUserJSON = `{"first_name": 1,"last_name": 2}`
+	noNameUserJSON  = `{"first_name": "","last_name": ""}`
 )
 
 func (r *mockUserRepository) Store(db *sqlx.DB, u domain.User) (int, error) {
@@ -31,6 +32,9 @@ func (r *mockUserRepository) Store(db *sqlx.DB, u domain.User) (int, error) {
 }
 
 func (r *mockUserRepository) FindAll(db *sqlx.DB) (domain.Users, error) {
+	if r.isError {
+		return nil, errors.New("error")
+	}
 	return nil, nil
 }
 
@@ -48,6 +52,20 @@ func newInvalidUserContext() echo.Context {
 	return e.NewContext(invalidReq, httptest.NewRecorder())
 }
 
+func noNameUserContext() echo.Context {
+	e := echo.New()
+	invalidReq := httptest.NewRequest(http.MethodPost, "/users", strings.NewReader(noNameUserJSON))
+	invalidReq.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON)
+	return e.NewContext(invalidReq, httptest.NewRecorder())
+}
+
+func indexContext() echo.Context {
+	e := echo.New()
+	validReq := httptest.NewRequest(http.MethodGet, "/users", nil)
+	validReq.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON)
+	return e.NewContext(validReq, httptest.NewRecorder())
+}
+
 // echoのtestについては以下を参照
 // https://echo.labstack.com/guide/testing
 // 課題: ユーザー名が空のケースを通す
@@ -91,6 +109,15 @@ func TestUserController_Create(t *testing.T) {
 			args:    args{c: newInvalidUserContext()},
 			wantErr: true,
 		},
+		{
+			name: "ユーザー名が空",
+			fields: fields{
+				db:         nil,
+				repository: &mockUserRepository{},
+			},
+			args:    args{c: noNameUserContext()},
+			wantErr: true,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -120,7 +147,23 @@ func TestUserController_Index(t *testing.T) {
 		args    args
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		{
+			name: "正常系",
+			fields: fields{
+				db:         nil,
+				repository: &mockUserRepository{},
+			},
+			args:    args{c: indexContext()},
+		},
+		{
+			name: "異常系",
+			fields: fields{
+				db:         nil,
+				repository: &mockUserRepository{isError: true},
+			},
+			args:    args{c: indexContext()},
+			wantErr: true,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

interface/api/interfaces/database/user_local_repository.go

@@ -2,6 +2,7 @@ package database
 
 import (
 	"sync"
+	"sort"
 
 	"github.com/jmoiron/sqlx"
 
@@ -40,5 +41,19 @@ func (r *onMemoryUserRepository) Store(db *sqlx.DB, u domain.User) (int, error)
 // 実装は課題
 // 出来ればuser_id昇順で返す
 func (r *onMemoryUserRepository) FindAll(db *sqlx.DB) (domain.Users, error) {
-	return nil, nil
+	//r.usersをid順にソートする
+	userIds := make([]int, len(r.users))
+	index := 0
+	for userId := range r.users {
+		userIds[index] = userId
+		index++
+	}
+	sort.Ints(userIds)
+
+	users := domain.Users{}
+	for _, id := range userIds {
+		users = append(users, r.users[id])
+	}
+
+	return users, nil
 }