From c8b55f68668d5967e028601814c888930fa17366 Mon Sep 17 00:00:00 2001
From: Vyacheslav1557 <slavabirin1@yandex.ru>
Date: Fri, 16 Aug 2024 16:10:21 +0500
Subject: [PATCH] feat: add submodule

---
 .gitmodules                    |  3 ++
 Makefile                       |  7 +++-
 buf.gen.yaml                   |  2 +-
 proto                          |  1 +
 proto/session/v1/session.proto | 35 -----------------
 proto/user/v1/user.proto       | 72 ----------------------------------
 6 files changed, 10 insertions(+), 110 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 proto
 delete mode 100644 proto/session/v1/session.proto
 delete mode 100644 proto/user/v1/user.proto

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..b358abe
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "proto"]
+	path = proto
+	url = https://git.sch9.ru/new_gate/contracts
diff --git a/Makefile b/Makefile
index 22909bb..a997530 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
+gen:
+	@buf generate proto/session
+	@buf generate proto/user
 dev:
-	@buf generate proto
+	@make gen
 	@go run main.go
 
 build:
-	@buf generate proto
+	@make gen
 	# TODO: build dockerfile
diff --git a/buf.gen.yaml b/buf.gen.yaml
index d5b53a4..7a3b53b 100644
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@@ -2,7 +2,7 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: ms-auth/pkg/go/gen
+    default: ./pkg/go/gen
 plugins:
   - name: go
     out: pkg/go/gen
diff --git a/proto b/proto
new file mode 160000
index 0000000..b679e06
--- /dev/null
+++ b/proto
@@ -0,0 +1 @@
+Subproject commit b679e062747938cbd23e7b6f950b05f75eced5b4
diff --git a/proto/session/v1/session.proto b/proto/session/v1/session.proto
deleted file mode 100644
index d9f09eb..0000000
--- a/proto/session/v1/session.proto
+++ /dev/null
@@ -1,35 +0,0 @@
-syntax = "proto3";
-
-package proto.session.v1;
-
-import "google/protobuf/empty.proto";
-
-service SessionService {
-  rpc Create (CreateSessionRequest) returns (CreateSessionResponse);
-  rpc Read (ReadSessionRequest) returns (ReadSessionResponse);
-  rpc Update (UpdateSessionRequest) returns (google.protobuf.Empty);
-  rpc Delete (DeleteSessionRequest) returns (google.protobuf.Empty);
-}
-
-message CreateSessionRequest {
-  string handle = 1;
-  string password = 2;
-}
-message CreateSessionResponse {
-  string token = 1;
-}
-
-message ReadSessionRequest {
-  string token = 1;
-}
-message ReadSessionResponse {
-  int32 user_id = 2;
-}
-
-message UpdateSessionRequest {
-  string token = 1;
-}
-
-message DeleteSessionRequest {
-  string token = 1;
-}
\ No newline at end of file
diff --git a/proto/user/v1/user.proto b/proto/user/v1/user.proto
deleted file mode 100644
index 25403e1..0000000
--- a/proto/user/v1/user.proto
+++ /dev/null
@@ -1,72 +0,0 @@
-syntax = "proto3";
-
-package proto.user.v1;
-
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/empty.proto";
-
-service UserService {
-  rpc CreateUser (CreateUserRequest) returns (CreateUserResponse);
-  rpc ReadUser (ReadUserRequest) returns (ReadUserResponse);
-  rpc UpdateUser (UpdateUserRequest) returns (google.protobuf.Empty);
-  rpc DeleteUser (DeleteUserRequest) returns (google.protobuf.Empty);
-}
-
-enum Role {
-  ROLE_SPECTATOR_UNSPECIFIED = 0;
-  ROLE_PARTICIPANT = 1;
-  ROLE_MODERATOR = 2;
-  ROLE_ADMIN = 3;
-}
-
-message CreateUserRequest {
-  message User {
-    string username = 1;
-    string password = 2;
-    reserved 3;
-    optional google.protobuf.Timestamp expires_at = 4;
-    Role role = 5;
-  }
-
-  string token = 1;
-  User user = 2;
-}
-message CreateUserResponse {
-  int32 id = 1;
-}
-
-message ReadUserRequest {
-  string token = 1;
-  int32 id = 2;
-}
-message ReadUserResponse {
-  message User {
-    int32 id = 1;
-    string username = 2;
-    reserved 3;
-    string password = 4;
-    google.protobuf.Timestamp expires_at = 5;
-    google.protobuf.Timestamp created_at = 6;
-    Role role = 7;
-  }
-  User user = 1;
-}
-
-message UpdateUserRequest {
-  message User {
-    int32 id = 1;
-    optional string username = 2;
-    reserved 3;
-    optional string password = 4;
-    optional google.protobuf.Timestamp expires_at = 5;
-    optional Role role = 6;
-  }
-
-  string token = 1;
-  User user = 2;
-}
-
-message DeleteUserRequest {
-  string token = 1;
-  int32 id = 2;
-}
\ No newline at end of file