Merge pull request #31 from NikhilSharma03/project_restructure

refactor: project restructure

Makefile

@@ -1,20 +1,19 @@
-# gen-protobuf generates .pb.go for protobuf files
-gen-protobuf:
-	protoc -I ./server/api \
-		--go_out ./server/pkg --go_opt paths=source_relative \
-  		--go-grpc_out ./server/pkg --go-grpc_opt paths=source_relative \
-  	   	--grpc-gateway_out ./server/pkg --grpc-gateway_opt paths=source_relative \
-  		./server/api/protobuf/*.proto ./server/api/google/api/*.proto ./server/api/google/type/*.proto
+.PHONY: generate-proto-protoc
+generate-proto-protoc:
+	protoc -I ./api \
+		--go_out ./pkg --go_opt paths=source_relative \
+		--go-grpc_out ./pkg --go-grpc_opt paths=source_relative \
+		--grpc-gateway_out ./pkg --grpc-gateway_opt paths=source_relative \
+		./api/protobuf/*.proto ./api/google/api/*.proto ./api/google/type/*.proto
 
+.PHONY: generate-proto
+generate-proto:
+	buf generate api
 
-# clean-protobuf removes generated .pb.go files
-clean-protobuf:
-	rm -rf server/pkg/protobuf
+.PHONY: clean-proto
+clean-proto:
+	rm -rf pkg/protobuf pkg/google
 
-# run-server starts the grpc server
+.PHONY: run-server
 run-server:
-	go run server/cmd/main.go
-
-# build-cli builds the cli app
-build-cli:
-	cd cli; go build -o okane
+	go run cmd/main.go

api/buf.yaml

@@ -0,0 +1,7 @@
+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT

server/api/google/api/annotations.proto → api/google/api/annotations.proto

@@ -28,4 +28,4 @@ option objc_class_prefix = "GAPI";
 extend google.protobuf.MethodOptions {
   // See `HttpRule`.
   HttpRule http = 72295728;
-}
+}

server/api/protobuf/okane.proto → api/protobuf/okane.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package okanepb;
 
-option go_package = "github.com/NikhilSharma03/Okane/server/api/protobuf/okane;okanepb";
+option go_package = "github.com/NikhilSharma03/Okane/api/protobuf/okane;okanepb";
 
 import "google/type/money.proto";
 import "google/api/annotations.proto";

buf.gen.yaml

@@ -0,0 +1,15 @@
+version: v1
+plugins:
+  - plugin: go
+    out: pkg
+    opt:
+      - paths=source_relative
+  - plugin: go-grpc
+    out: pkg
+    opt:
+      - paths=source_relative
+  - plugin: grpc-gateway
+    out: pkg
+    opt:
+      - paths=source_relative
+      - generate_unbound_methods=true

buf.work.yaml

@@ -0,0 +1,4 @@
+version: v1
+directories:
+  - api
+

server/cmd/main.go → cmd/main.go

@@ -8,10 +8,10 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/NikhilSharma03/Okane/server/internal/app"
-	"github.com/NikhilSharma03/Okane/server/internal/repository"
-	"github.com/NikhilSharma03/Okane/server/internal/service"
-	okanepb "github.com/NikhilSharma03/Okane/server/pkg/protobuf"
+	"github.com/NikhilSharma03/Okane/internal/app"
+	"github.com/NikhilSharma03/Okane/internal/repository"
+	"github.com/NikhilSharma03/Okane/internal/service"
+	okanepb "github.com/NikhilSharma03/Okane/pkg/protobuf"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/joho/godotenv"
 	"google.golang.org/grpc"

server/internal/app/create_expense.go → internal/app/create_expense.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/NikhilSharma03/Okane/server/internal/datastruct"
-	okanepb "github.com/NikhilSharma03/Okane/server/pkg/protobuf"
+	"github.com/NikhilSharma03/Okane/internal/datastruct"
+	okanepb "github.com/NikhilSharma03/Okane/pkg/protobuf"
 	"google.golang.org/genproto/googleapis/type/money"
 )
 

server/internal/app/create_user.go → internal/app/create_user.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	okanepb "github.com/NikhilSharma03/Okane/server/pkg/protobuf"
+	okanepb "github.com/NikhilSharma03/Okane/pkg/protobuf"
 	"google.golang.org/genproto/googleapis/type/money"
 )
 

server/internal/app/delete_expense.go → internal/app/delete_expense.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	okanepb "github.com/NikhilSharma03/Okane/server/pkg/protobuf"
+	okanepb "github.com/NikhilSharma03/Okane/pkg/protobuf"
 )
 
 // Delete Expense deletes the expense by the provided expense id

server/internal/app/delete_user.go → internal/app/delete_user.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	okanepb "github.com/NikhilSharma03/Okane/server/pkg/protobuf"
+	okanepb "github.com/NikhilSharma03/Okane/pkg/protobuf"
 	"google.golang.org/genproto/googleapis/type/money"
 )
 

server/internal/app/get_expense.go → internal/app/get_expense.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	okanepb "github.com/NikhilSharma03/Okane/server/pkg/protobuf"
+	okanepb "github.com/NikhilSharma03/Okane/pkg/protobuf"
 	"google.golang.org/genproto/googleapis/type/money"
 )
 

server/internal/app/get_expense_id.go → internal/app/get_expense_id.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	okanepb "github.com/NikhilSharma03/Okane/server/pkg/protobuf"
+	okanepb "github.com/NikhilSharma03/Okane/pkg/protobuf"
 	"google.golang.org/genproto/googleapis/type/money"
 )
 

server/internal/app/get_user.go → internal/app/get_user.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	okanepb "github.com/NikhilSharma03/Okane/server/pkg/protobuf"
+	okanepb "github.com/NikhilSharma03/Okane/pkg/protobuf"
 	"google.golang.org/genproto/googleapis/type/money"
 )
 

server/internal/app/service.go → internal/app/service.go

@@ -1,8 +1,8 @@
 package app
 
 import (
-	"github.com/NikhilSharma03/Okane/server/internal/service"
-	okanepb "github.com/NikhilSharma03/Okane/server/pkg/protobuf"
+	"github.com/NikhilSharma03/Okane/internal/service"
+	okanepb "github.com/NikhilSharma03/Okane/pkg/protobuf"
 )
 
 // The UserService implements handler of okanepb.UserService

server/internal/app/update_expense.go → internal/app/update_expense.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/NikhilSharma03/Okane/server/internal/datastruct"
-	okanepb "github.com/NikhilSharma03/Okane/server/pkg/protobuf"
+	"github.com/NikhilSharma03/Okane/internal/datastruct"
+	okanepb "github.com/NikhilSharma03/Okane/pkg/protobuf"
 	"google.golang.org/genproto/googleapis/type/money"
 )
 

server/internal/app/update_user.go → internal/app/update_user.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	okanepb "github.com/NikhilSharma03/Okane/server/pkg/protobuf"
+	okanepb "github.com/NikhilSharma03/Okane/pkg/protobuf"
 	"google.golang.org/genproto/googleapis/type/money"
 )
 

server/internal/repository/expense.go → internal/repository/expense.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/NikhilSharma03/Okane/server/internal/datastruct"
+	"github.com/NikhilSharma03/Okane/internal/datastruct"
 	"github.com/go-redis/redis/v8"
 )
 

server/internal/repository/user.go → internal/repository/user.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/NikhilSharma03/Okane/server/internal/datastruct"
-	"github.com/NikhilSharma03/Okane/server/internal/utils"
+	"github.com/NikhilSharma03/Okane/internal/datastruct"
+	"github.com/NikhilSharma03/Okane/internal/utils"
 	"github.com/go-redis/redis/v8"
 )
 

server/internal/service/expense.go → internal/service/expense.go

@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/NikhilSharma03/Okane/server/internal/datastruct"
-	"github.com/NikhilSharma03/Okane/server/internal/repository"
-	"github.com/NikhilSharma03/Okane/server/internal/utils"
+	"github.com/NikhilSharma03/Okane/internal/datastruct"
+	"github.com/NikhilSharma03/Okane/internal/repository"
+	"github.com/NikhilSharma03/Okane/internal/utils"
 	"github.com/google/uuid"
 )
 

server/internal/service/user.go → internal/service/user.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/NikhilSharma03/Okane/server/internal/datastruct"
-	"github.com/NikhilSharma03/Okane/server/internal/repository"
+	"github.com/NikhilSharma03/Okane/internal/datastruct"
+	"github.com/NikhilSharma03/Okane/internal/repository"
 	"github.com/google/uuid"
 	"golang.org/x/crypto/bcrypt"
 )