fix elasticsearch

Author: ad3n

dics/provider.go

@@ -1,6 +1,7 @@
 package dics
 
 import (
+	"github.com/crowdeco/skeleton/dics/modules"
 	"github.com/sarulabs/dingo/v4"
 )
 
@@ -21,5 +22,9 @@ func (p *Provider) Load() error {
 		return err
 	}
 
+	if err := p.AddDefSlice(modules.Todo); err != nil {
+		return err
+	}
+
 	return nil
 }

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/fatih/color v1.10.0
 	github.com/gadelkareem/cachita v0.2.1
 	github.com/gertd/go-pluralize v0.1.7
+	github.com/go-ozzo/ozzo-validation/v4 v4.3.0
 	github.com/golang/protobuf v1.4.3
 	github.com/google/go-cmp v0.5.4 // indirect
 	github.com/google/uuid v1.1.5

go.sum

@@ -41,6 +41,8 @@ github.com/ThreeDotsLabs/watermill-amqp v1.1.0/go.mod h1:Qbu3JDlr6vIOxHJjhfsSHsr
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 h1:zV3ejI06GQ59hwDQAvmK1qxOQGB3WuVTRoY0okPTAv0=
+github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
 github.com/aws/aws-sdk-go v1.35.20/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -88,6 +90,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-ozzo/ozzo-validation/v4 v4.3.0 h1:byhDUpfEwjsVQb1vBunvIjh2BHQ9ead57VkAEY4V+Es=
+github.com/go-ozzo/ozzo-validation/v4 v4.3.0/go.mod h1:2NKgrcHl3z6cJs+3Oo940FPRiTzuqKbvfrL2RxCj6Ew=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=

listeners/deletes/elasticsearch.go

@@ -18,8 +18,7 @@ func (d *Elasticsearch) Handle(event interface{}) {
 	e := event.(*events.ModelEvent)
 
 	m := e.Data.(configs.Model)
-	query := elastic.NewBoolQuery()
-	query.Must(elastic.NewTermQuery("Id", e.Id))
+	query := elastic.NewMatchQuery("ID", e.Id)
 	result, _ := d.Elasticsearch.Search().Index(m.TableName()).Query(query).Do(d.Context)
 	for _, hit := range result.Hits.Hits {
 		d.Elasticsearch.Delete().Index(m.TableName()).Id(hit.Id).Do(d.Context)

listeners/updates/elasticsearch.go

@@ -19,8 +19,7 @@ func (u *Elasticsearch) Handle(event interface{}) {
 	e := event.(*events.ModelEvent)
 
 	m := e.Data.(configs.Model)
-	query := elastic.NewBoolQuery()
-	query.Must(elastic.NewTermQuery("Id", e.Id))
+	query := elastic.NewMatchQuery("ID", e.Id)
 	result, _ := u.Elasticsearch.Search().Index(m.TableName()).Query(query).Do(u.Context)
 	for _, hit := range result.Hits.Hits {
 		u.Elasticsearch.Delete().Index(m.TableName()).Id(hit.Id).Do(u.Context)

modules.yaml

@@ -1 +1,2 @@
 modules:
+- module:todo

swaggers/apidocs.swagger.json

@@ -133,12 +133,6 @@
             "in": "query",
             "required": false,
             "type": "string"
-          },
-          {
-            "name": "title",
-            "in": "query",
-            "required": false,
-            "type": "string"
           }
         ],
         "tags": [
@@ -173,12 +167,6 @@
             "in": "query",
             "required": false,
             "type": "string"
-          },
-          {
-            "name": "title",
-            "in": "query",
-            "required": false,
-            "type": "string"
           }
         ],
         "tags": [
@@ -297,9 +285,6 @@
         },
         "name": {
           "type": "string"
-        },
-        "title": {
-          "type": "string"
         }
       }
     },