add condition search on property api

kurab · Jan 22, 2020 · 3af381e · 3af381e
1 parent 11b8496
commit 3af381e
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 0 deletions.
diff --git a/infrastructure/api/handler/propertyHandler.go b/infrastructure/api/handler/propertyHandler.go
@@ -13,6 +13,7 @@ import (
 type PropertyHandler interface {
     GetAllProperties(w http.ResponseWriter, r *http.Request, _ httprouter.Params)
     GetProperty(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
+    GetPropertiesByPref(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
 }
 
 type propertyHandler struct {
@@ -33,3 +34,9 @@ func (ph *propertyHandler) GetProperty(w http.ResponseWriter, r *http.Request, p
     prop, _ := ph.PropertyController.GetProperty(id)
     json.NewEncoder(w).Encode(prop)
 }
+
+func (ph *propertyHandler) GetPropertiesByPref(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+    pref_cd, _ := strconv.Atoi(ps.ByName("pref_cd"))
+    props, _ := ph.PropertyController.GetPropertiesByPref(pref_cd)
+    json.NewEncoder(w).Encode(props)
+}
diff --git a/infrastructure/api/router/router.go b/infrastructure/api/router/router.go
@@ -15,4 +15,5 @@ func NewRouter(router *httprouter.Router, handler handler.AppHandler) {
     // PROPERTY API
     router.GET("/api/property/get", handler.PropertyHandler.GetAllProperties)
     router.GET("/api/property/get/:id", handler.PropertyHandler.GetProperty)
+    router.GET("/api/property/pref/get/:pref_cd", handler.PropertyHandler.GetPropertiesByPref)
 }
diff --git a/infrastructure/datastore/propertyRepository.go b/infrastructure/datastore/propertyRepository.go
@@ -9,6 +9,7 @@ import (
 type PropertyRepository interface {
     FindAll() (model.Properties, error)
     FindById(id int) (model.Property, error)
+    FindByPref(pref_cd int) (model.Properties, error)
 }
 
 type propertyRepository struct {
@@ -33,3 +34,12 @@ func (pr *propertyRepository) FindById(id int) (model.Property, error) {
     err := pr.db.Where("id = ?", id).First(&prop).Error
     return prop, err
 }
+
+func (pr *propertyRepository) FindByPref(pref_cd int) (model.Properties, error) {
+    props := model.Properties{}
+    err := pr.db.Where("pref_cd = ?", pref_cd).Where("flg_open = ?", true).Order("pref_cd").Order("price").Find(&props).Error
+    if err != nil {
+        return nil, err
+    }
+    return props, nil
+}
diff --git a/interface/controllers/propertyController.go b/interface/controllers/propertyController.go
@@ -8,6 +8,7 @@ import (
 type PropertyController interface {
     GetAllProperties() (model.Properties, error)
     GetProperty(id int) (model.Property, error)
+    GetPropertiesByPref(pref_cd int) (model.Properties, error)
 }
 
 type propertyController struct {
@@ -30,3 +31,11 @@ func (pc *propertyController) GetProperty(id int) (model.Property, error) {
     prop, err := pc.PropertyService.Get(id)
     return prop, err
 }
+
+func (pc *propertyController) GetPropertiesByPref(pref_cd int) (model.Properties, error) {
+    props, err := pc.PropertyService.GetByPref(pref_cd)
+    if err != nil {
+        return nil, err
+    }
+    return props, nil
+}
diff --git a/usecase/repository/propertyRepository.go b/usecase/repository/propertyRepository.go
@@ -5,4 +5,5 @@ import "api/domain/model"
 type PropertyRepository interface {
     FindAll() (model.Properties, error)
     FindById(id int) (model.Property, error)
+    FindByPref(pref_cd int) (model.Properties, error)
 }
diff --git a/usecase/service/propertyService.go b/usecase/service/propertyService.go
@@ -9,6 +9,7 @@ import (
 type PropertyService interface {
     GetAll() (model.Properties, error)
     Get(id int) (model.Property, error)
+    GetByPref(pref_cd int) (model.Properties, error)
 }
 
 type propertyService struct {
@@ -32,3 +33,11 @@ func (ps *propertyService) Get(id int) (model.Property, error) {
     prop, err := ps.PropertyRepository.FindById(id)
     return prop, err
 }
+
+func (ps *propertyService) GetByPref(pref_cd int) (model.Properties, error) {
+    props, err := ps.PropertyRepository.FindByPref(pref_cd)
+    if err != nil {
+        return nil, err
+    }
+    return ps.PropertyPresenter.ResponseProperties(props), nil
+}