[FEAT][#8] warp users proto to users directory

jacky-htg · Jan 21, 2021 · 0226321 · 0226321
1 parent 59fa45b
commit 0226321
Show file tree

Hide file tree

Showing 70 changed files with 1,502 additions and 1,482 deletions.
diff --git a/client/main.go b/client/main.go
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/grpc"
 
 	"user-service/client/service"
-	users "user-service/pb"
+	"user-service/pb/users"
 )
 
 func main() {

diff --git a/client/service/access.go b/client/service/access.go
@@ -3,7 +3,7 @@ package service
 import (
 	"context"
 	"log"
-	users "user-service/pb"
+	"user-service/pb/users"
 )
 
 // ViewAccessTree service client

diff --git a/client/service/auth.go b/client/service/auth.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"log"
 	"user-service/internal/pkg/app"
-	users "user-service/pb"
+	"user-service/pb/users"
 )
 
 // Login service client

diff --git a/client/service/branch.go b/client/service/branch.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 	"log"
-	users "user-service/pb"
+	"user-service/pb/users"
 )
 
 // CreateBranch service client

diff --git a/client/service/company.go b/client/service/company.go
@@ -3,7 +3,7 @@ package service
 import (
 	"context"
 	"log"
-	users "user-service/pb"
+	"user-service/pb/users"
 )
 
 // Registration service client

diff --git a/client/service/employee.go b/client/service/employee.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 	"log"
-	users "user-service/pb"
+	"user-service/pb/users"
 )
 
 // CreateEmployee service client

diff --git a/client/service/feature.go b/client/service/feature.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 	"log"
-	users "user-service/pb"
+	"user-service/pb/users"
 )
 
 // ListFeature service client

diff --git a/client/service/group.go b/client/service/group.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 	"log"
-	users "user-service/pb"
+	"user-service/pb/users"
 )
 
 // CreateGroup service client

diff --git a/client/service/region.go b/client/service/region.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 	"log"
-	users "user-service/pb"
+	"user-service/pb/users"
 )
 
 // CreateRegion service client

diff --git a/client/service/user.go b/client/service/user.go
@@ -3,7 +3,7 @@ package service
 import (
 	"io"
 	"log"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"golang.org/x/net/context"
 )

diff --git a/internal/model/access.go b/internal/model/access.go
@@ -3,7 +3,7 @@ package model
 import (
 	"context"
 	"database/sql"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/internal/model/branch.go b/internal/model/branch.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 	"user-service/internal/pkg/app"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"github.com/golang/protobuf/ptypes"
 

diff --git a/internal/model/company.go b/internal/model/company.go
@@ -5,7 +5,7 @@ import (
 	"database/sql"
 	"time"
 	"user-service/internal/pkg/app"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"github.com/google/uuid"
 	"golang.org/x/crypto/bcrypt"

diff --git a/internal/model/employee.go b/internal/model/employee.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 	"user-service/internal/pkg/app"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"github.com/golang/protobuf/ptypes"
 	"github.com/google/uuid"

diff --git a/internal/model/feature.go b/internal/model/feature.go
@@ -3,7 +3,7 @@ package model
 import (
 	"context"
 	"database/sql"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/internal/model/group.go b/internal/model/group.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 	"user-service/internal/pkg/app"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"github.com/golang/protobuf/ptypes"
 

diff --git a/internal/model/region.go b/internal/model/region.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 	"user-service/internal/pkg/app"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"github.com/google/uuid"
 	"google.golang.org/grpc/codes"

diff --git a/internal/model/request_password.go b/internal/model/request_password.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"time"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"github.com/golang/protobuf/ptypes"
 

diff --git a/internal/model/user.go b/internal/model/user.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 	"user-service/internal/pkg/app"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"github.com/google/uuid"
 	"golang.org/x/crypto/bcrypt"

diff --git a/internal/route/route.go b/internal/route/route.go
@@ -8,7 +8,7 @@ import (
 
 	"user-service/internal/pkg/db/redis"
 	"user-service/internal/service"
-	users "user-service/pb"
+	"user-service/pb/users"
 )
 
 // GrpcRoute func

diff --git a/internal/service/access.go b/internal/service/access.go
@@ -5,7 +5,7 @@ import (
 	"database/sql"
 	"user-service/internal/model"
 	"user-service/internal/pkg/db/redis"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/internal/service/auth.go b/internal/service/auth.go
@@ -16,7 +16,7 @@ import (
 	"user-service/internal/pkg/db/redis"
 	"user-service/internal/pkg/email"
 	"user-service/internal/pkg/token"
-	users "user-service/pb"
+	"user-service/pb/users"
 )
 
 // Auth struct

diff --git a/internal/service/branch.go b/internal/service/branch.go
@@ -3,7 +3,7 @@ package service
 import (
 	"context"
 	"database/sql"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"user-service/internal/model"
 	"user-service/internal/pkg/app"

diff --git a/internal/service/company.go b/internal/service/company.go
@@ -5,7 +5,7 @@ import (
 	"database/sql"
 	"os"
 	"regexp"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"user-service/internal/model"
 	"user-service/internal/pkg/app"

diff --git a/internal/service/employee.go b/internal/service/employee.go
@@ -6,7 +6,7 @@ import (
 	"user-service/internal/model"
 	"user-service/internal/pkg/app"
 	"user-service/internal/pkg/db/redis"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/internal/service/feature.go b/internal/service/feature.go
@@ -3,7 +3,7 @@ package service
 import (
 	"database/sql"
 	"user-service/internal/pkg/db/redis"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/internal/service/group.go b/internal/service/group.go
@@ -7,7 +7,7 @@ import (
 	"user-service/internal/model"
 	"user-service/internal/pkg/app"
 	"user-service/internal/pkg/db/redis"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/internal/service/package_feature.go b/internal/service/package_feature.go
@@ -5,7 +5,7 @@ import (
 	"database/sql"
 	"user-service/internal/model"
 	"user-service/internal/pkg/db/redis"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/internal/service/region.go b/internal/service/region.go
@@ -7,7 +7,7 @@ import (
 	"user-service/internal/model"
 	"user-service/internal/pkg/app"
 	"user-service/internal/pkg/db/redis"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/internal/service/user.go b/internal/service/user.go
@@ -10,7 +10,7 @@ import (
 	"user-service/internal/pkg/db/redis"
 	"user-service/internal/pkg/email"
 	"user-service/internal/pkg/token"
-	users "user-service/pb"
+	"user-service/pb/users"
 
 	"github.com/sendgrid/sendgrid-go/helpers/mail"
 	"google.golang.org/grpc/codes"

diff --git a/makefile b/makefile
@@ -1,5 +1,5 @@
 gen:
-	protoc --proto_path=proto proto/*.proto --go_out=plugins=grpc:. 
+	protoc --proto_path=proto proto/users/*.proto --go_out=plugins=grpc:. 
 
 init:
 	go mod init user-service