Update Status
This commit is contained in:
parent
3e138d72a3
commit
99a569afb3
@ -5,6 +5,7 @@ type DiscoverySearch struct {
|
|||||||
Long float64
|
Long float64
|
||||||
Name string
|
Name string
|
||||||
Region string
|
Region string
|
||||||
|
Status string
|
||||||
Discover string
|
Discover string
|
||||||
Offset int
|
Offset int
|
||||||
Limit int
|
Limit int
|
||||||
|
|||||||
@ -42,6 +42,7 @@ type SiteSearch struct {
|
|||||||
Name string
|
Name string
|
||||||
Limit int
|
Limit int
|
||||||
Offset int
|
Offset int
|
||||||
|
Status string
|
||||||
}
|
}
|
||||||
|
|
||||||
type SiteList []*SiteDB
|
type SiteList []*SiteDB
|
||||||
|
|||||||
@ -93,7 +93,10 @@ func (r *SiteRepository) GetAll(ctx context.Context, req entity.SiteSearch) (ent
|
|||||||
|
|
||||||
query := r.db
|
query := r.db
|
||||||
query = query.Where("deleted_at IS NULL")
|
query = query.Where("deleted_at IS NULL")
|
||||||
query = query.Where("status is ?", "Active")
|
|
||||||
|
if req.Status != "" {
|
||||||
|
query = query.Where("status = ?", req.Status)
|
||||||
|
}
|
||||||
|
|
||||||
if req.Search != "" {
|
if req.Search != "" {
|
||||||
query = query.Where("name ILIKE ?", "%"+req.Search+"%")
|
query = query.Where("name ILIKE ?", "%"+req.Search+"%")
|
||||||
@ -233,6 +236,11 @@ func (r *SiteRepository) SearchSites(ctx context.Context, search *entity.Discove
|
|||||||
params = append(params, search.Region)
|
params = append(params, search.Region)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if search.Status != "" {
|
||||||
|
conditions += " AND s.status = ?"
|
||||||
|
params = append(params, search.Status)
|
||||||
|
}
|
||||||
|
|
||||||
if search.Discover != "" {
|
if search.Discover != "" {
|
||||||
conditions += " AND s.address ILIKE ?"
|
conditions += " AND s.address ILIKE ?"
|
||||||
params = append(params, "%"+search.Discover+"%")
|
params = append(params, "%"+search.Discover+"%")
|
||||||
|
|||||||
@ -83,6 +83,7 @@ func (s *DiscoveryService) Search(ctx context.Context, search *entity.DiscoveryS
|
|||||||
search.Radius = radius
|
search.Radius = radius
|
||||||
}
|
}
|
||||||
|
|
||||||
|
search.Status = "Active"
|
||||||
siteProducts, total, err := s.repo.SearchSites(ctx, search)
|
siteProducts, total, err := s.repo.SearchSites(ctx, search)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user