Dev4

.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+name: Start pinspire CI
+
+on:
+  workflow_dispatch: {}
+  push: {}
+  pull_request:
+    types: [opened, edited, reopened]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get repository code
+        uses: actions/checkout@v4
+      - name: Test application
+        continue-on-error: true
+        run: go test ./...
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get repository code
+        uses: actions/checkout@v4
+      - name: Lint application
+        run: make lint
+  build:  
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get repository code
+        uses: actions/checkout@v4    
+      - name: Build application
+        run: make build_all

.github/workflows/deployment.yml

@@ -0,0 +1,58 @@
+name: Start Pinspire deployment
+
+on:
+  workflow_dispatch: {}
+  push:
+    branches:
+      - main
+      - dev4
+
+jobs:
+  build_images:
+    runs-on: ubuntu-latest
+    steps:
+      - name: get repository code
+        uses: actions/checkout@v4
+      - name: Login to DockerHub Registry
+        run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+      - name: Build docker images of services
+        run: |
+          docker build -t pinspireapp/main:latest -f deployments/Dockerfile.main . &
+          docker build -t pinspireapp/auth:latest -f deployments/Dockerfile.auth . &
+          docker build -t pinspireapp/realtime:latest -f deployments/Dockerfile.realtime . &
+          docker build -t pinspireapp/messenger:latest -f deployments/Dockerfile.messenger . &
+          for p in $(jobs -p); do wait "$p" || { echo "job $p failed" >&2; exit; }; done
+      - name: Push docker images
+        run: |
+          docker push pinspireapp/main:latest &
+          docker push pinspireapp/auth:latest &
+          docker push pinspireapp/realtime:latest &
+          docker push pinspireapp/messenger:latest &
+          for p in $(jobs -p); do wait "$p" || { echo "job $p failed" >&2; exit; }; done
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build_images
+    steps:
+      - name: fetch changes
+        uses: appleboy/ssh-action@master
+        with:
+          host: pinspire.site
+          username: ${{ secrets.REMOTE_USERNAME }}
+          key: ${{ secrets.PRIVATE_KEY }}
+          script: |
+            cd ${{ secrets.PINSPIRE_BACKEND_PATH }}
+            sudo git switch dev4
+            sudo git pull
+      - name: deploy application
+        uses: appleboy/ssh-action@master
+        with:
+          host: pinspire.site
+          username: ${{ secrets.REMOTE_USERNAME }}
+          key: ${{ secrets.PRIVATE_KEY }}
+          script: |
+            cd ${{ secrets.PINSPIRE_BACKEND_PATH }}/deployments 
+            sudo docker compose down main_service auth_service realtime_service messenger_service
+            sudo docker rmi pinspireapp/main:latest pinspireapp/auth:latest pinspireapp/realtime:latest pinspireapp/messenger:latest
+            sudo docker compose -f docker-compose.yml -f compose.prod.yml up -d
+

.gitignore

@@ -25,3 +25,6 @@ testdata/
 cert/
 .env
 redis.conf
+inventory
+keyVision.json
+script*

Makefile

@@ -1,14 +1,31 @@
 .PHONY: build run test test_with_coverage cleantest retest doc generate cover_all currcover
+.PHONY: build_auth  build_realtime build_messenger build_all
+.PHONY: .install-linter lint lint-fast
+
 ENTRYPOINT=cmd/app/main.go
 DOC_DIR=./docs
 COV_OUT=coverage.out
 COV_HTML=coverage.html
 CURRCOVER=github.com/go-park-mail-ru/2023_2_OND_team/internal/pkg/delivery/http/v1
 
+PROJECT_BIN = $(CURDIR)/bin
+$(shell [ -f bin ] || mkdir -p $(PROJECT_BIN))
+GOLANGCI_LINT = $(PROJECT_BIN)/golangci-lint
 
 build:
 	go build -o bin/app cmd/app/*.go
 
+build_auth:
+	go build -o bin/auth cmd/auth/*.go
+
+build_realtime:
+	go build -o bin/realtime cmd/realtime/*.go
+
+build_messenger:
+	go build -o bin/messenger cmd/messenger/*.go
+
+build_all: build build_auth build_realtime build_messenger
+
 run: build
 	./bin/app
 
@@ -40,3 +57,12 @@ cover_all:
 currcover:
 	go test -cover -v -coverprofile=cover.out ${CURRCOVER}
 	go tool cover -html=cover.out -o cover.html
+
+.install-linter:
+	[ -f $(PROJECT_BIN)/golangci-lint ] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_BIN) v1.55.2
+
+lint: .install-linter
+	$(GOLANGCI_LINT) run ./... --config=configs/.golangci.yml
+
+lint-fast: .install-linter
+	$(GOLANGCI_LINT) run ./... --fast --config=configs/.golangci.yml

api/proto/auth.proto

@@ -0,0 +1,41 @@
+syntax = "proto3";
+
+import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
+
+option go_package = "github.com/go-park-mail-ru/2023_2_OND_team/internal/api/auth";
+
+package auth;
+
+service Auth {
+    rpc Register(RegisterData) returns (google.protobuf.Empty) {}
+    rpc Login(Credentials) returns (Session) {}
+    rpc Logout(Session) returns (google.protobuf.Empty) {}
+    rpc GetUserID(Session) returns (UserID) {}
+}
+
+message Credentials {
+    string password = 1;
+    string username = 2;
+}
+
+message RegisterData {
+    Credentials cred = 1;
+    string email = 2;
+}
+
+message User {
+    int64 id = 1;
+    string username = 2;
+    string avatar = 3;
+}
+
+message Session {
+    string key = 1;
+    int64 userID = 2;
+    google.protobuf.Timestamp expire = 3;
+}
+
+message UserID {
+    int64 id = 1;
+}

api/proto/messenger.proto

@@ -0,0 +1,64 @@
+syntax = "proto3";
+
+import "google/protobuf/empty.proto";
+
+option go_package = "github.com/go-park-mail-ru/2023_2_OND_team/internal/api/messenger";
+
+package messenger;
+
+service Messenger {
+    rpc UserChatsWithOtherUsers(FeedChatRequest) returns (FeedChat) {}
+    rpc SendMessage(Message) returns (MsgID) {}
+    rpc MessageFromChat(FeedMessageRequest) returns (FeedMessage) {}
+    rpc UpdateMessage(Message) returns (google.protobuf.Empty) {}
+    rpc DeleteMessage(MsgID) returns (google.protobuf.Empty) {}
+    rpc GetMessage(MsgID) returns (Message) {}
+}
+
+message MsgID {
+    int64 id = 1;
+}
+
+message Message {
+    MsgID id = 1;
+    int64 user_from = 2;
+    int64 user_to = 3;
+    string content = 4;
+}
+
+message Chat {
+    int64 userID1 = 1;
+    int64 userID2 = 2;
+}
+
+message FeedChatRequest {
+    int64 count = 1;
+    int64 lastID = 2;
+}
+
+message FeedMessageRequest {
+    Chat chat = 1;
+    int64 count = 2;
+    int64 lastID = 3;
+}
+
+message WichWhomChat {
+    int64 userID = 1;
+    string username = 2;
+    string avatar = 3;
+}
+
+message ChatWithUser {
+    int64 lastMessageID = 1;
+    WichWhomChat chat = 2;
+}
+
+message FeedMessage {
+    repeated Message messages = 1;
+    int64 lastID = 2;
+}
+
+message FeedChat {
+    repeated ChatWithUser chats = 1;
+    int64 lastID = 2;
+}

api/proto/realtime.proto

@@ -0,0 +1,49 @@
+syntax = "proto3";
+
+import "google/protobuf/empty.proto";
+
+option go_package = "github.com/go-park-mail-ru/2023_2_OND_team/internal/api/realtime";
+
+package realtime;
+
+service RealTime {
+    rpc Publish(PublishMessage) returns (google.protobuf.Empty) {}
+    rpc Subscribe(Channels) returns (stream Message) {}
+}
+
+message Channels {
+    repeated Channel chans = 1;
+}
+
+message Channel {
+    string topic = 1;
+    string name = 2;
+}
+
+enum EventType {
+    EV_CREATE = 0;
+    EV_DELETE = 1;
+    EV_UPDATE = 2;
+}
+
+message EventObject {
+    int64 id = 1;
+    EventType type = 2;
+}
+
+message EventMap {
+    int64 type = 1;
+    map<string, string> m = 2;
+}
+
+message Message {
+    oneof body {
+        EventObject object = 1;
+        EventMap content = 2;
+    }
+}
+
+message PublishMessage {
+    Channel channel = 1;
+    Message message = 2;
+}

cmd/app/main.go

@@ -2,10 +2,18 @@ package main
 
 import (
 	"context"
+	"flag"
 	"fmt"
+	"os"
 
 	"github.com/go-park-mail-ru/2023_2_OND_team/internal/app"
 	"github.com/go-park-mail-ru/2023_2_OND_team/pkg/logger"
+	"github.com/joho/godotenv"
+)
+
+var (
+	logOutput      = flag.String("log", "stdout", "file paths to write logging output to")
+	logErrorOutput = flag.String("logerror", "stderr", "path to write internal logger errors to.")
 )
 
 //	@title			Pinspire API
@@ -21,15 +29,25 @@ import (
 //	@license.url	http://www.apache.org/licenses/LICENSE-2.0.html
 
 func main() {
+	godotenv.Load()
+	flag.Parse()
 	ctxBase, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	log, err := logger.New(logger.RFC3339FormatTime())
+	log, err := logger.New(
+		logger.RFC3339FormatTime(),
+		logger.SetOutputPaths(*logOutput),
+		logger.SetErrorOutputPaths(*logErrorOutput),
+	)
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
 	defer log.Sync()
 
+	configFiles := app.ConfigFiles{
+		ServerConfigFile: "configs/config.yml",
+		AddrAuthServer:   os.Getenv("AUTH_SERVICE_HOST") + ":" + os.Getenv("AUTH_SERVICE_PORT"), // "localhost:8085",
+	}
 	app.Run(ctxBase, log, configFiles)
 }

cmd/auth/config.go

@@ -0,0 +1,8 @@
+package main
+
+import "github.com/go-park-mail-ru/2023_2_OND_team/internal/app/auth"
+
+var configAuth = auth.Config{
+	Addr:            "0.0.0.0:8085",
+	RedisFileConfig: "redis.conf",
+}

cmd/auth/main.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/go-park-mail-ru/2023_2_OND_team/internal/app/auth"
+	"github.com/go-park-mail-ru/2023_2_OND_team/pkg/logger"
+)
+
+func main() {
+	log, err := logger.New(logger.RFC3339FormatTime())
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer log.Sync()
+
+	auth.Run(context.Background(), log, configAuth)
+}