Skip to content
This repository has been archived by the owner on Oct 28, 2021. It is now read-only.

Commit

Permalink
swagger fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Minish144 committed Sep 30, 2021
1 parent d15a224 commit b6f9091
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 12 deletions.
2 changes: 1 addition & 1 deletion gen/pb/api.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions gen/pb/common.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 14 additions & 1 deletion gen/pb/common.pb.validate.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gen/swagger/api.swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"email": "varlamow.col@yahoo.com"
}
},
"host": "localhost:3010",
"host": "localhost:3201",
"schemes": [
"http",
"https"
Expand Down
38 changes: 38 additions & 0 deletions modules/controllers/messages/handlers.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package messages

import (
"context"

"github.com/minish144/go-sms-api/gen/pb"
"github.com/minish144/go-sms-api/modules/modem"
"github.com/sirupsen/logrus"
"github.com/spf13/viper"
)

func Send(ctx context.Context, in *pb.Messages_SendRequest) (*pb.Messages_SendResponse, error) {
if err := in.Validate(); err != nil {
return nil, err
}

comport := viper.GetString("modem.comport")
baudrate := viper.GetInt("modem.baudrate")
newModem := modem.New(comport, baudrate)

if err := newModem.Send(in.Message.Phone, in.Message.Message); err != nil {
logrus.WithFields(
logrus.Fields{
"error": err.Error(),
},
).Errorln("failed to send sms")
return nil, err
}

logrus.WithFields(
logrus.Fields{
"phone": in.Message.Phone,
"message": in.Message.Message,
},
).Infoln("sms was sent successfully")

return &pb.Messages_SendResponse{}, nil
}
2 changes: 1 addition & 1 deletion modules/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func Run() {

mux.HandleFunc("/swagger.json", serveSwagger)

logrus.Infoln("serving gRPC-Gateway on " + httpConnectionString)
logrus.Infoln("serving HTTP gRPC-Gateway on " + httpConnectionString)
if err := http.ListenAndServe(httpConnectionString, allowCORS(mux)); err != nil {
logrus.WithFields(logrus.Fields{
"error": err.Error(),
Expand Down
3 changes: 2 additions & 1 deletion modules/server/structs.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ import (
"context"

"github.com/minish144/go-sms-api/gen/pb"
"github.com/minish144/go-sms-api/modules/controllers/messages"
)

type ApiServiceServer struct {
pb.UnimplementedApiServiceServer
}

func (s *ApiServiceServer) SendMessage(ctx context.Context, in *pb.Messages_SendRequest) (*pb.Messages_SendResponse, error) {
return nil, nil
return messages.Send(ctx, in)
}
2 changes: 1 addition & 1 deletion proto/api.proto
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
email: "varlamow.col@yahoo.com"
};
};
host: "localhost:3010",
host: "localhost:3201",
schemes: [HTTP, HTTPS]
consumes: "application/json"
produces: "application/json"
Expand Down
2 changes: 1 addition & 1 deletion proto/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ import public "github.com/envoyproxy/protoc-gen-validate/validate/validate.proto

message Message {
string phone = 1 [(validate.rules).string = { pattern: "^\\+(?:[0-9]●?){6,14}[0-9]$" }];
string message = 2;
string message = 2 [(validate.rules).string = { ignore_empty: true, max_len: 160 }];
}

0 comments on commit b6f9091

Please sign in to comment.