From 2e510b22a46941237840e55c6e55b2ff7512f3d7 Mon Sep 17 00:00:00 2001
From: Fedorov Vladimir <vladimir.fodorow@gmail.com>
Date: Sat, 7 Jun 2025 22:20:14 +0700
Subject: [PATCH] update folders

---
 .gitignore                                 | 2 ++
 cmd/evening_detective/main.go              | 2 +-
 {story => data/story}/story.json           | 0
 docker-compose.yml                         | 8 ++++++++
 internal/services/repository.go            | 2 +-
 internal/services/story_service/service.go | 5 +++--
 6 files changed, 15 insertions(+), 4 deletions(-)
 rename {story => data/story}/story.json (100%)

diff --git a/.gitignore b/.gitignore
index 87b978c..10ba30e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ store.db
 
 cmd/text_to_story/*.txt
 cmd/text_to_story/*.json
+
+bin/*
diff --git a/cmd/evening_detective/main.go b/cmd/evening_detective/main.go
index 87623e9..5511999 100644
--- a/cmd/evening_detective/main.go
+++ b/cmd/evening_detective/main.go
@@ -32,7 +32,7 @@ func main() {
 	}
 	storyService, err := story_service.NewStoryService()
 	if err != nil {
-		panic(err)
+		log.Fatalln(err)
 	}
 	proto.RegisterEveningDetectiveServer(
 		s,
diff --git a/story/story.json b/data/story/story.json
similarity index 100%
rename from story/story.json
rename to data/story/story.json
diff --git a/docker-compose.yml b/docker-compose.yml
index e6faca9..991eb8f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,5 +7,13 @@ services:
       dockerfile: Dockerfile
     ports:
       - "8080:8080"
+      - "8090:8090"
+      - "8100:8100"
+      - "8110:8110"
+    volumes:
+      - data:/data
 #    environment:
 #      - ENV_VAR_NAME=env_var_value
+
+volumes:
+  data:
diff --git a/internal/services/repository.go b/internal/services/repository.go
index d36188a..fb52234 100644
--- a/internal/services/repository.go
+++ b/internal/services/repository.go
@@ -14,7 +14,7 @@ type Repository struct {
 }
 
 func NewRepository() (*Repository, error) {
-	db, err := sql.Open("sqlite3", "store.db")
+	db, err := sql.Open("sqlite3", "data/db/store.db")
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/services/story_service/service.go b/internal/services/story_service/service.go
index 3f3eb96..e842781 100644
--- a/internal/services/story_service/service.go
+++ b/internal/services/story_service/service.go
@@ -2,6 +2,7 @@ package story_service
 
 import (
 	"encoding/json"
+	"errors"
 	"os"
 	"strings"
 )
@@ -44,9 +45,9 @@ type StoryService struct {
 }
 
 func NewStoryService() (*StoryService, error) {
-	data, err := os.ReadFile("./story/story.json")
+	data, err := os.ReadFile("./data/story/story.json")
 	if err != nil {
-		return nil, err
+		return nil, errors.New("Файл истории не найден")
 	}
 	story := &Story{}
 	if err := json.Unmarshal(data, story); err != nil {