Skip to content

Commit

Permalink
added comment
Browse files Browse the repository at this point in the history
  • Loading branch information
buraksecer committed Dec 7, 2021
1 parent 34e87e9 commit 730d490
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 28 deletions.
9 changes: 4 additions & 5 deletions example/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,18 @@ func main() {
// Get a topic list
topics := topic.Topics()

for i, v := range topics.Topics {
r := fmt.Sprintf("index:/%d/ - value:/%s/ ", i, v)
fmt.Println(r)
for _, v := range topics.Topics {
fmt.Println(v)
}

// Create a new subscription
topic.CreateSubscription(topicName,subName)
topic.CreateSubscription(topicName, subName)

// Get subscriptions
topic.Subscriptions(topicName)

// Publish a new message
topic.Publish(topicName,"Fly me to the moon..")
topic.Publish(topicName, "Fly me to the moon..")

// Get message to sub
topic.Receive(subName)
Expand Down
3 changes: 2 additions & 1 deletion internal/error/clienterr/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ package clienterr

import "errors"

var ClientCannotCreate = errors.New("client can not create")
// ErrClientCannotCreate err
var ErrClientCannotCreate = errors.New("client can not create")
3 changes: 2 additions & 1 deletion internal/error/convererr/conver.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ package convererr

import "errors"

var JsonMarshalCanNotBeParse = errors.New("json marshal can not be parse")
// ErrJsonMarshalCanNotBeParse err
var ErrJsonMarshalCanNotBeParse = errors.New("json marshal can not be parse")
19 changes: 14 additions & 5 deletions internal/error/topicerr/topic.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@ package topicerr

import "errors"

var TopicCanNotCreate = errors.New("topic can not create")
var TopicDoExist = errors.New("topic do exist")
var TopicDoNotExist = errors.New("topic do not exist")
var TopicCanNotExists = errors.New("topic does not exist")
var TopicCanNotDelete = errors.New("topic can not delete")
// ErrTopicCanNotCreate err
var ErrTopicCanNotCreate = errors.New("topic can not create")

// ErrTopicDoExist err
var ErrTopicDoExist = errors.New("topic do exist")

// ErrTopicDoNotExist err
var ErrTopicDoNotExist = errors.New("topic do not exist")

// ErrTopicCanNotExists err
var ErrTopicCanNotExists = errors.New("topic does not exist")

// ErrTopicCanNotDelete err
var ErrTopicCanNotDelete = errors.New("topic can not delete")
1 change: 1 addition & 0 deletions internal/model/response/topicres/topics.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package topicres

// TopicsModel is a struct
type TopicsModel struct {
Topics []string
}
2 changes: 1 addition & 1 deletion pkg/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func Create(clientId string) (Client, context.Context, error) {
c, err := pubsub.NewClient(ctx, clientId)

if err != nil {
err = clienterr.ClientCannotCreate
err = clienterr.ErrClientCannotCreate
}

client := Client{
Expand Down
29 changes: 14 additions & 15 deletions pkg/topic/topic.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,22 @@ func Create(topicName string) error {
defer client.Close(c)

if err != nil {
return clienterr.ClientCannotCreate
return clienterr.ErrClientCannotCreate
}

e := c.Client.Topic(topicName)
ok, err := e.Exists(ctx)
if err != nil {
return topicerr.TopicCanNotExists
return topicerr.ErrTopicCanNotExists
}
if ok {
return topicerr.TopicDoExist
return topicerr.ErrTopicDoExist
}

topic, err := c.Client.CreateTopic(ctx, topicName)

if err != nil {
return topicerr.TopicCanNotCreate
return topicerr.ErrTopicCanNotCreate
}

defer topic.Stop()
Expand All @@ -64,16 +64,15 @@ func Delete(topicName string) (bool, error) {
defer client.Close(c)

if err != nil {
return false, clienterr.ClientCannotCreate
return false, clienterr.ErrClientCannotCreate
}

topic := c.Client.Topic(topicName)
defer topic.Stop()
if err := topic.Delete(ctx); err != nil {
return false, topicerr.TopicCanNotDelete
} else {
return true, nil
return false, topicerr.ErrTopicCanNotDelete
}
return true, nil
}

// Exists topic control in project
Expand All @@ -84,7 +83,7 @@ func Exists(topicName string) (bool, error) {
defer client.Close(c)

if err != nil {
return false, clienterr.ClientCannotCreate
return false, clienterr.ErrClientCannotCreate
}

e := c.Client.Topic(topicName)
Expand All @@ -101,7 +100,7 @@ func Topics() topicres.TopicsModel {
defer client.Close(c)

if err != nil {
log.Println(clienterr.ClientCannotCreate)
log.Println(clienterr.ErrClientCannotCreate)
return topics
}

Expand Down Expand Up @@ -129,7 +128,7 @@ func CreateSubscription(topicName string, subName string) {
defer client.Close(c)

if err != nil {
log.Println(clienterr.ClientCannotCreate)
log.Println(clienterr.ErrClientCannotCreate)
return
}

Expand All @@ -139,7 +138,7 @@ func CreateSubscription(topicName string, subName string) {
return
}
if !exist {
log.Println(topicerr.TopicDoNotExist)
log.Println(topicerr.ErrTopicDoNotExist)
return
}

Expand Down Expand Up @@ -169,7 +168,7 @@ func Subscriptions(topicName string) {
defer client.Close(c)

if err != nil {
log.Println(clienterr.ClientCannotCreate)
log.Println(clienterr.ErrClientCannotCreate)
}

topic := c.Client.Topic(topicName)
Expand Down Expand Up @@ -199,7 +198,7 @@ func Publish(topicName string, message interface{}) (bool, error) {
defer client.Close(c)

if err != nil {
return false, clienterr.ClientCannotCreate
return false, clienterr.ErrClientCannotCreate
}

topic := c.Client.Topic(topicName)
Expand All @@ -208,7 +207,7 @@ func Publish(topicName string, message interface{}) (bool, error) {

m, err := json.Marshal(message)
if err != nil {
return false, convererr.JsonMarshalCanNotBeParse
return false, convererr.ErrJsonMarshalCanNotBeParse
}

var results []*pubsub.PublishResult
Expand Down

0 comments on commit 730d490

Please sign in to comment.