hbl-ngocnd1 · hblab-annq · Sep 6, 2022 · Sep 9, 2022 · Sep 9, 2022 · Sep 9, 2022
diff --git a/cache/%e4%b8%ad%e6%96%ad-chuudan b/cache/%e4%b8%ad%e6%96%ad-chuudan
diff --git a/cache/%e5%88%86%e6%95%a3-bunsan b/cache/%e5%88%86%e6%95%a3-bunsan
diff --git a/cache/%e5%88%86%e9%85%8d-bunpai b/cache/%e5%88%86%e9%85%8d-bunpai
diff --git a/cache/%e5%9c%a7%e5%80%92-attou b/cache/%e5%9c%a7%e5%80%92-attou
diff --git a/cache/%e5%9c%a7%e5%8a%9b-atsuryoku b/cache/%e5%9c%a7%e5%8a%9b-atsuryoku
diff --git a/cache/%e5%a4%a7%e8%83%86-daitan b/cache/%e5%a4%a7%e8%83%86-daitan
diff --git a/cache/%e5%bc%81%e8%ad%b7-bengo b/cache/%e5%bc%81%e8%ad%b7-bengo
diff --git a/cache/%e6%8c%91%e6%88%a6-chousen b/cache/%e6%8c%91%e6%88%a6-chousen
diff --git a/cache/%e6%96%87%e6%9b%b8-bunsho b/cache/%e6%96%87%e6%9b%b8-bunsho
diff --git a/cache/%e6%9a%b4%e5%8a%9b-bouryoku b/cache/%e6%9a%b4%e5%8a%9b-bouryoku
diff --git a/cache/%e6%ad%a6%e8%a3%85-busou b/cache/%e6%ad%a6%e8%a3%85-busou
diff --git a/cache/%e7%84%a1%e7%a4%bc-burei b/cache/%e7%84%a1%e7%a4%bc-burei
diff --git a/cache/%e7%88%86%e5%bc%be-bakudan b/cache/%e7%88%86%e5%bc%be-bakudan
diff --git a/cache/%e7%9b%b4%e6%84%9f-chokkan b/cache/%e7%9b%b4%e6%84%9f-chokkan
diff --git a/cache/%e7%9d%80%e6%89%8b-chakushu b/cache/%e7%9d%80%e6%89%8b-chakushu
diff --git a/cache/%e7%9f%a5%e6%80%a7-chisei b/cache/%e7%9f%a5%e6%80%a7-chisei
diff --git a/cache/%e7%a7%a9%e5%ba%8f-chitsujo b/cache/%e7%a7%a9%e5%ba%8f-chitsujo
diff --git a/cache/%e8%86%a8%e5%bc%b5-bouchou b/cache/%e8%86%a8%e5%bc%b5-bouchou
diff --git a/cache/%e8%93%84%e7%a9%8d-chikuseki b/cache/%e8%93%84%e7%a9%8d-chikuseki
diff --git a/cache/%e8%b2%b7%e5%8f%8e-baishuu b/cache/%e8%b2%b7%e5%8f%8e-baishuu
diff --git a/cache/%e8%b3%83%e9%87%91-chingin b/cache/%e8%b3%83%e9%87%91-chingin
diff --git a/cache/%e8%b5%a4%e5%ad%97-akaji b/cache/%e8%b5%a4%e5%ad%97-akaji
diff --git a/cache/%e8%bf%91%e3%81%a5%e3%81%8f-chikazuku b/cache/%e8%bf%91%e3%81%a5%e3%81%8f-chikazuku
diff --git a/cache/%e9%83%a8%e4%b8%8b-buka b/cache/%e9%83%a8%e4%b8%8b-buka
diff --git a/cache/%e9%98%b2%e8%a1%9b-bouei b/cache/%e9%98%b2%e8%a1%9b-bouei
diff --git a/cache/jlpt-n1-vocabulary-list b/cache/jlpt-n1-vocabulary-list
diff --git a/cache/learn-jlpt-n1-vocabulary-%e4%be%ae%e8%be%b1-bujoku b/cache/learn-jlpt-n1-vocabulary-%e4%be%ae%e8%be%b1-bujoku
diff --git a/cache/learn-jlpt-n1-vocabulary-%e5%90%8c%e9%a1%9e-dourui b/cache/learn-jlpt-n1-vocabulary-%e5%90%8c%e9%a1%9e-dourui
diff --git a/cache/learn-jlpt-n1-vocabulary-%e5%bc%81%e6%98%8e-benmei b/cache/learn-jlpt-n1-vocabulary-%e5%bc%81%e6%98%8e-benmei
diff --git a/cache/learn-jlpt-n1-vocabulary-%e5%bc%81%e8%a7%a3-benkai b/cache/learn-jlpt-n1-vocabulary-%e5%bc%81%e8%a7%a3-benkai
diff --git a/cache/learn-jlpt-n1-vocabulary-%e5%be%ae%e7%ac%91-bishou b/cache/learn-jlpt-n1-vocabulary-%e5%be%ae%e7%ac%91-bishou
diff --git a/cache/learn-jlpt-n1-vocabulary-%e5%bf%a0%e5%91%8a-chuukoku b/cache/learn-jlpt-n1-vocabulary-%e5%bf%a0%e5%91%8a-chuukoku
diff --git a/cache/learn-jlpt-n1-vocabulary-%e5%bf%a0%e5%ae%9f-chuujitsu b/cache/learn-jlpt-n1-vocabulary-%e5%bf%a0%e5%ae%9f-chuujitsu
diff --git a/cache/learn-jlpt-n1-vocabulary-%e6%82%aa%e4%ba%8b-akuji b/cache/learn-jlpt-n1-vocabulary-%e6%82%aa%e4%ba%8b-akuji
diff --git a/cache/learn-jlpt-n1-vocabulary-%e6%89%93%e6%92%83-dageki b/cache/learn-jlpt-n1-vocabulary-%e6%89%93%e6%92%83-dageki
diff --git a/cache/learn-jlpt-n1-vocabulary-%e6%89%b1%e3%81%84-atsukai b/cache/learn-jlpt-n1-vocabulary-%e6%89%b1%e3%81%84-atsukai
diff --git a/cache/learn-jlpt-n1-vocabulary-%e6%95%8f%e6%84%9f-binkan b/cache/learn-jlpt-n1-vocabulary-%e6%95%8f%e6%84%9f-binkan
diff --git a/cache/learn-jlpt-n1-vocabulary-%e6%b2%88%e9%bb%99-chinmoku b/cache/learn-jlpt-n1-vocabulary-%e6%b2%88%e9%bb%99-chinmoku
diff --git a/cache/learn-jlpt-n1-vocabulary-%e8%aa%bf%e9%81%94-choutatsu b/cache/learn-jlpt-n1-vocabulary-%e8%aa%bf%e9%81%94-choutatsu
diff --git a/cache/learn-jlpt-n1-vocabulary-%e8%b2%a7%e4%b9%8f-binbou b/cache/learn-jlpt-n1-vocabulary-%e8%b2%a7%e4%b9%8f-binbou
diff --git a/cache/learn-jlpt-n1-vocabulary-%e9%81%8e%e3%81%a1-ayamachi b/cache/learn-jlpt-n1-vocabulary-%e9%81%8e%e3%81%a1-ayamachi
diff --git a/controller/dictionary.go b/controller/dictionary.go
@@ -5,6 +5,8 @@ import (
 	"net/http"
 	"strconv"
 
+	"github.com/hbl-ngocnd1/dictionary/models"
+
 	"github.com/hbl-ngocnd1/dictionary/usecase"
 	"github.com/labstack/echo/v4"
 )
@@ -24,37 +26,7 @@ func (f *dictHandler) Dict(c echo.Context) error {
 }
 
 func (f *dictHandler) ApiDict(c echo.Context) error {
-	notCache := c.QueryParam("not_cache")
-	level := c.QueryParam("level")
-	start, err := strconv.Atoi(c.QueryParam("start"))
-	if err != nil {
-		start = 0
-	}
-	pageSize, err := strconv.Atoi(c.QueryParam("page_size"))
-	if err != nil {
-		pageSize = 20
-	}
-	if level == "" {
-		level = "n1"
-	}
-	switch level {
-	case "n1", "n2", "n3", "n4", "n5":
-	default:
-		return c.NoContent(http.StatusBadRequest)
-	}
-	pwd := c.QueryParam("password")
-	ctx := context.Background()
-	data, err := f.dictUseCase.GetDict(ctx, start, pageSize, notCache, level, pwd)
-	switch err {
-	case nil:
-	case usecase.InvalidErr:
-		return c.NoContent(http.StatusBadRequest)
-	case usecase.PermissionDeniedErr:
-		return c.NoContent(http.StatusForbidden)
-	default:
-		return c.String(http.StatusInternalServerError, err.Error())
-	}
-	return c.JSON(http.StatusOK, data)
+	return getDataJapanese(f, c, models.MakeWord)
 }
 
 func (f *dictHandler) ApiGetDetail(c echo.Context) error {
@@ -89,7 +61,7 @@ func (f *dictHandler) ITJapanWonderWord(c echo.Context) error {
 
 func (f *dictHandler) ApiITJapanWonderWord(c echo.Context) error {
 	ctx := context.Background()
-	data, err := f.dictUseCase.GetITJapanWonderWork(ctx)
+	data, err := f.dictUseCase.GetITJapanWonderWork(ctx, models.MakeWonderWork)
 	switch err {
 	case nil:
 	case usecase.InvalidErr:
@@ -98,7 +70,42 @@ func (f *dictHandler) ApiITJapanWonderWord(c echo.Context) error {
 		return c.String(http.StatusInternalServerError, err.Error())
 	}
 	if data == nil {
+
 		return c.String(http.StatusOK, "")
 	}
 	return c.JSON(http.StatusOK, data)
 }
+
+func getDataJapanese(f *dictHandler, c echo.Context, makeData models.MakeData) error {
+	notCache := c.QueryParam("not_cache")
+	level := c.QueryParam("level")
+	start, err := strconv.Atoi(c.QueryParam("start"))
+	if err != nil {
+		start = 0
+	}
+	pageSize, err := strconv.Atoi(c.QueryParam("page_size"))
+	if err != nil {
+		pageSize = 20
+	}
+	if level == "" {
+		level = "n1"
+	}
+	switch level {
+	case "n1", "n2", "n3", "n4", "n5":
+	default:
+		return c.NoContent(http.StatusBadRequest)
+	}
+	pwd := c.QueryParam("password")
+	ctx := context.Background()
+	data, err := f.dictUseCase.GetDict(ctx, start, pageSize, notCache, level, pwd, makeData)
+	switch err {
+	case nil:
+	case usecase.InvalidErr:
+		return c.NoContent(http.StatusBadRequest)
+	case usecase.PermissionDeniedErr:
+		return c.NoContent(http.StatusForbidden)
+	default:
+		return c.String(http.StatusInternalServerError, err.Error())
+	}
+	return c.JSON(http.StatusOK, data)
+}
diff --git a/controller/dictionary_test.go b/controller/dictionary_test.go
@@ -40,7 +40,7 @@ func TestNewDictHandler(t *testing.T) {
 			statusCode:  http.StatusOK,
 			newMockDictUC: func(ctrl *gomock.Controller) usecase.DictUseCase {
 				mock := mock_usecase.NewMockDictUseCase(ctrl)
-				mock.EXPECT().GetDict(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]models.Word{{}, {}, {}}, nil)
+				mock.EXPECT().GetDict(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]models.Word{{}, {}, {}}, nil)
 				return mock
 			},
 		},
@@ -54,7 +54,7 @@ func TestNewDictHandler(t *testing.T) {
 			urlParam:    "",
 			newMockDictUC: func(ctrl *gomock.Controller) usecase.DictUseCase {
 				mock := mock_usecase.NewMockDictUseCase(ctrl)
-				mock.EXPECT().GetDict(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, errors.New("unexpected"))
+				mock.EXPECT().GetDict(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, errors.New("unexpected"))
 				return mock
 			},
 			statusCode: http.StatusInternalServerError,
@@ -65,7 +65,7 @@ func TestNewDictHandler(t *testing.T) {
 			statusCode:  http.StatusBadRequest,
 			newMockDictUC: func(ctrl *gomock.Controller) usecase.DictUseCase {
 				mock := mock_usecase.NewMockDictUseCase(ctrl)
-				mock.EXPECT().GetDict(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]models.Word{{}, {}, {}}, usecase.InvalidErr)
+				mock.EXPECT().GetDict(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]models.Word{{}, {}, {}}, usecase.InvalidErr)
 				return mock
 			},
 		},
@@ -75,7 +75,7 @@ func TestNewDictHandler(t *testing.T) {
 			statusCode:  http.StatusForbidden,
 			newMockDictUC: func(ctrl *gomock.Controller) usecase.DictUseCase {
 				mock := mock_usecase.NewMockDictUseCase(ctrl)
-				mock.EXPECT().GetDict(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]models.Word{{}, {}, {}}, usecase.PermissionDeniedErr)
+				mock.EXPECT().GetDict(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]models.Word{{}, {}, {}}, usecase.PermissionDeniedErr)
 				return mock
 			},
 		},
@@ -85,7 +85,7 @@ func TestNewDictHandler(t *testing.T) {
 			statusCode:  http.StatusInternalServerError,
 			newMockDictUC: func(ctrl *gomock.Controller) usecase.DictUseCase {
 				mock := mock_usecase.NewMockDictUseCase(ctrl)
-				mock.EXPECT().GetDict(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]models.Word{{}, {}, {}}, errors.New("another Error"))
+				mock.EXPECT().GetDict(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]models.Word{{}, {}, {}}, errors.New("another Error"))
 				return mock
 			},
 		},