My branch

README.md

@@ -2,4 +2,16 @@
 
 В директории `tests` находятся тесты для проверки API, которое должно быть реализовано в веб-сервере.
 
-Директория `web` содержит файлы фронтенда.
+Директория `web` содержит файлы фронтенда.
+
+в main.go Шаг 1 ТЗ + обработчики + Шаг 1* + Шаг2*
+в base.go Шаг 2 ТЗ - создание БД  
+в task/dates.go Шаг 3-4 ТЗ 
+в task/addGet.go Шаг 4-5 ТЗ 
+в task/changeDelete.go Шаг 6-7 ТЗ 
+в handlers.go все хэндлеры 
+все тесты проходят
+
+Для запуска сервера прописать в командной строке: go run main. go
+Проверить работу базовых функций можно в браузере на: localhost:7540
+Для проверки всех тестов в новом терминале запустить проверку командой: go test ./tests

base/base.go

@@ -0,0 +1,61 @@
+package base
+
+import (
+	"database/sql"
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+
+	_ "modernc.org/sqlite"
+)
+
+// Создание базы данных 2ой шаг
+func CreateDB(envDBFILE string) (db *sql.DB, err error) {
+	var appPath string
+	if envDBFILE != "" {
+		appPath = envDBFILE
+	} else {
+		appPath, err = os.Getwd() //не смогла реализовать через os.Executable()
+		if err != nil {
+			log.Fatal(err)
+			return nil, err
+		}
+	}
+
+	var install bool
+	dbFile := filepath.Join(appPath, "scheduler.db")
+	if _, err := os.Stat(dbFile); os.IsNotExist(err) {
+		install = true
+		fmt.Println("db не найдена, создаём новую")
+	}
+
+	db, err = sql.Open("sqlite", dbFile)
+	if err != nil {
+		log.Fatal(err)
+		return nil, err
+	}
+
+	if install {
+
+		// Создание базы данных
+		_, err = db.Exec(`CREATE TABLE IF NOT EXISTS scheduler(
+			id INTEGER PRIMARY KEY AUTOINCREMENT,
+			date TEXT NOT NULL,
+			title TEXT NOT NULL DEFAULT "",
+			comment TEXT,
+			repeat VARCHAR(128) NOT NULL DEFAULT "");`)
+		if err != nil {
+			log.Fatal(err)
+			return nil, err
+		}
+		_, err = db.Exec(`CREATE INDEX IF NOT EXISTS scheduler_date ON scheduler (date);`)
+		if err != nil {
+			log.Fatal(err)
+			return nil, err
+		}
+
+		fmt.Println("База данных успешно создана!")
+	}
+	return db, nil
+}

go.mod

@@ -0,0 +1,25 @@
+module github.com/dekatei/go_final_project 
+
+go 1.22.6
+
+require (
+	github.com/jmoiron/sqlx v1.4.0
+	github.com/mattn/go-sqlite3 v1.14.24
+	github.com/stretchr/testify v1.10.0
+	modernc.org/sqlite v1.34.5
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	golang.org/x/sys v0.22.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	modernc.org/libc v1.55.3 // indirect
+	modernc.org/mathutil v1.6.0 // indirect
+	modernc.org/memory v1.8.0 // indirect
+)

go.sum

@@ -0,0 +1,64 @@
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
+github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo=
+github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
+github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
+github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
+github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
+golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
+golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ=
+modernc.org/cc/v4 v4.21.4/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
+modernc.org/ccgo/v4 v4.19.2 h1:lwQZgvboKD0jBwdaeVCTouxhxAyN6iawF3STraAal8Y=
+modernc.org/ccgo/v4 v4.19.2/go.mod h1:ysS3mxiMV38XGRTTcgo0DQTeTmAO4oCmJl1nX9VFI3s=
+modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
+modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
+modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw=
+modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
+modernc.org/libc v1.55.3 h1:AzcW1mhlPNrRtjS5sS+eW2ISCgSOLLNyFzRh/V3Qj/U=
+modernc.org/libc v1.55.3/go.mod h1:qFXepLhz+JjFThQ4kzwzOjA/y/artDeg+pcYnY+Q83w=
+modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
+modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
+modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
+modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
+modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
+modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
+modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss=
+modernc.org/sqlite v1.34.5 h1:Bb6SR13/fjp15jt70CL4f18JIN7p7dnMExd+UFnF15g=
+modernc.org/sqlite v1.34.5/go.mod h1:YLuNmX9NKs8wRNK2ko1LW1NGYcc9FkBO69JOt1AR9JE=
+modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
+modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
+modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
+modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=

handlers/handlers.go

@@ -0,0 +1,87 @@
+package handlers
+
+import (
+	"database/sql"
+	"errors"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/dekatei/go_final_project/task"
+	_ "modernc.org/sqlite"
+)
+
+// 3ий шаг
+func NextDateHandler(w http.ResponseWriter, req *http.Request) {
+	nowStr := req.URL.Query().Get("now")
+	if nowStr == "" {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte("now missing"))
+		err := errors.New("пропущено время")
+		fmt.Println(err)
+	}
+
+	now, err := time.Parse("20060102", nowStr)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte("wrong time value"))
+		fmt.Println(err)
+	}
+
+	date := req.URL.Query().Get("date")
+	repeat := req.URL.Query().Get("repeat")
+	nextDate, err := task.NextDate(now, date, repeat)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	w.WriteHeader(http.StatusOK)
+	w.Write([]byte(nextDate))
+
+}
+
+// 4ый шаг
+func TaskHandler(w http.ResponseWriter, req *http.Request, db *sql.DB) {
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	switch req.Method {
+	case http.MethodGet:
+		task.GetTask(w, req, db)
+	case http.MethodPost:
+		task.AddTask(w, req, db)
+	case http.MethodPut:
+		task.UpdateTask(w, req, db)
+	case http.MethodDelete:
+		task.DeleteTask(w, req, db)
+	default:
+		http.Error(w, fmt.Sprintf("Сервер не поддерживает %s запросы", req.Method),
+			http.StatusMethodNotAllowed)
+		return
+	}
+}
+
+// 7ой шаг
+func TaskDoneDeleteHandler(w http.ResponseWriter, req *http.Request, db *sql.DB) {
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	switch req.Method {
+	case http.MethodPost:
+		task.DoneTask(w, req, db)
+	case http.MethodDelete:
+		task.DeleteTask(w, req, db)
+	default:
+		http.Error(w, fmt.Sprintf("Сервер не поддерживает %s запросы", req.Method),
+			http.StatusMethodNotAllowed)
+		return
+	}
+}
+
+func GetTasksHandler(w http.ResponseWriter, req *http.Request, db *sql.DB) {
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	switch req.Method {
+	case http.MethodGet:
+		task.GetTasks(w, req, db)
+	default:
+		http.Error(w, fmt.Sprintf("Сервер не поддерживает %s запросы", req.Method),
+			http.StatusMethodNotAllowed)
+		return
+	}
+}

main.go

@@ -0,0 +1,49 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+
+	"github.com/dekatei/go_final_project/base"
+	"github.com/dekatei/go_final_project/handlers"
+)
+
+const webDir = "./web"
+
+func main() {
+	envDBFILE := os.Getenv("TODO_DBFILE")
+	db, err := base.CreateDB(envDBFILE)
+	// Подключаемся к БД
+	if err != nil {
+		log.Printf("Ошибка подключения к БД")
+		fmt.Println(err)
+		return
+
+	}
+	defer db.Close()
+	http.Handle("/", http.FileServer(http.Dir(webDir)))
+	http.HandleFunc(`/api/nextdate`, handlers.NextDateHandler)
+	http.HandleFunc(`/api/task`, func(w http.ResponseWriter, req *http.Request) {
+		handlers.TaskHandler(w, req, db)
+	})
+	http.HandleFunc(`/api/tasks`, func(w http.ResponseWriter, req *http.Request) {
+		handlers.GetTasksHandler(w, req, db)
+	})
+	http.HandleFunc(`/api/task/done`, func(w http.ResponseWriter, req *http.Request) {
+		handlers.TaskDoneDeleteHandler(w, req, db)
+	})
+	envPort := os.Getenv("TODO_PORT")
+	if envPort == "" {
+		envPort = "7540"
+	}
+
+	fmt.Printf("Запускаем сервер на порту: %s", envPort)
+
+	err = http.ListenAndServe(":"+envPort, nil)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println("Завершаем работу")
+}