Iter13

.gitignore

@@ -21,3 +21,6 @@ vendor/
 # IDEs directories
 .idea
 .vscode
+cmd/.DS_Store
+.DS_Store
+/tmp

cmd/shortener/main.go

@@ -1,3 +1,38 @@
 package main
 
-func main() {}
+import (
+	_ "github.com/jackc/pgx/v5/stdlib"
+	"github.com/shilin-anton/urlreducer/internal/app/config"
+	filemanager "github.com/shilin-anton/urlreducer/internal/app/file-manager"
+	handler "github.com/shilin-anton/urlreducer/internal/app/handlers"
+	"github.com/shilin-anton/urlreducer/internal/app/storage"
+	"github.com/shilin-anton/urlreducer/internal/logger"
+	"log"
+	"net/http"
+)
+
+func main() {
+	config.ParseConfig()
+	err := logger.Initialize(config.LogLevel)
+	if err != nil {
+		log.Fatal("Error initializing logger", err.Error())
+	}
+
+	var fl *filemanager.ExportedManager
+	if config.FilePath != "" {
+		fl = filemanager.New()
+	}
+
+	var db *storage.DataBase
+	if config.DBDSN != "" {
+		db, err = storage.NewDB(config.DBDSN)
+		if err != nil {
+			log.Fatal("Error initializing DB: ", err.Error())
+		}
+		defer db.Close()
+	}
+
+	myStorage := storage.New(fl, db)
+	myHandler := handler.New(myStorage)
+	log.Fatal(http.ListenAndServe(config.RunAddr, myHandler))
+}

go.mod

@@ -0,0 +1,26 @@
+module github.com/shilin-anton/urlreducer
+
+go 1.21.3
+
+require (
+	github.com/go-chi/chi/v5 v5.0.11
+	github.com/golang/mock v1.6.0
+	github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438
+	github.com/jackc/pgx/v5 v5.5.5
+	github.com/stretchr/testify v1.8.1
+	go.uber.org/zap v1.27.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
+	github.com/jackc/puddle/v2 v2.2.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	go.uber.org/multierr v1.10.0 // indirect
+	golang.org/x/crypto v0.17.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -0,0 +1,75 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+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/go-chi/chi/v5 v5.0.11 h1:BnpYbFZ3T3S1WMpD79r7R5ThWX40TaFB7L31Y8xqSwA=
+github.com/go-chi/chi/v5 v5.0.11/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
+github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 h1:Dj0L5fhJ9F82ZJyVOmBx6msDp/kfd1t9GRfny/mfJA0=
+github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds=
+github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw=
+github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=
+github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
+github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+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/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
+github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
+go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/app/config/config.go

@@ -0,0 +1,48 @@
+package config
+
+import (
+	"flag"
+	"os"
+)
+
+var RunAddr string
+var BaseAddr string
+var LogLevel string
+var FilePath string
+var DBDSN string
+
+const (
+	defaultRunURL   = "localhost:8080"
+	defaultBaseURL  = "http://localhost:8080"
+	defaultLogLevel = "info"
+	defaultFilePath = "/tmp/short-url-db.json"
+	//defaultFilePath = ""
+	//defaultDSN      = "host=127.0.0.1 user=postgres dbname=shortener sslmode=disable"
+	defaultDSN = ""
+)
+
+func ParseConfig() {
+	flag.StringVar(&RunAddr, "a", defaultRunURL, "address and port to run server")
+	flag.StringVar(&BaseAddr, "b", defaultBaseURL, "base URL before short link")
+	flag.StringVar(&LogLevel, "l", defaultLogLevel, "log level")
+	flag.StringVar(&FilePath, "f", defaultFilePath, "file storage path")
+	flag.StringVar(&DBDSN, "d", defaultDSN, "database DSN")
+
+	flag.Parse()
+
+	if envRunAddr := os.Getenv("SERVER_ADDRESS"); envRunAddr != "" {
+		RunAddr = envRunAddr
+	}
+	if envBaseAddr := os.Getenv("BASE_URL"); envBaseAddr != "" {
+		BaseAddr = envBaseAddr
+	}
+	if envLogLevel := os.Getenv("LOG_LEVEL"); envLogLevel != "" {
+		LogLevel = envLogLevel
+	}
+	if envFilePath := os.Getenv("FILE_STORAGE_PATH"); envFilePath != "" {
+		FilePath = envFilePath
+	}
+	if envDSN := os.Getenv("DATABASE_DSN"); envDSN != "" {
+		DBDSN = envDSN
+	}
+}

internal/app/file-manager/file_manager.go

@@ -0,0 +1,188 @@
+package filemanager
+
+import (
+	"bufio"
+	"encoding/json"
+	"github.com/shilin-anton/urlreducer/internal/app/config"
+	"github.com/shilin-anton/urlreducer/internal/app/model"
+	"log"
+	"os"
+	"strconv"
+)
+
+type record struct {
+	UUID        string `json:"uuid"`
+	ShortURL    string `json:"short_url"`
+	OriginalURL string `json:"original_url"`
+}
+
+type ExportedManager struct {
+}
+
+type FileWriter struct {
+	file    *os.File
+	scanner *bufio.Scanner
+	writer  *bufio.Writer
+}
+
+type FileReader struct {
+	file    *os.File
+	scanner *bufio.Scanner
+}
+
+func NewWriter() (*FileWriter, error) {
+	file, err := os.OpenFile(config.FilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+	if err != nil {
+		return nil, err
+	}
+
+	return &FileWriter{
+		file:    file,
+		scanner: bufio.NewScanner(file),
+		writer:  bufio.NewWriter(file),
+	}, nil
+}
+
+func (fw *FileWriter) Close() error {
+	return fw.file.Close()
+}
+
+func NewReader() (*FileReader, error) {
+	file, err := os.OpenFile(config.FilePath, os.O_RDONLY|os.O_CREATE, 0666)
+	if err != nil {
+		return nil, err
+	}
+
+	return &FileReader{
+		file:    file,
+		scanner: bufio.NewScanner(file),
+	}, nil
+}
+
+func (fr *FileReader) Close() {
+	fr.file.Close()
+}
+
+func New() *ExportedManager {
+	return &ExportedManager{}
+}
+
+func (em *ExportedManager) ReadFromFile(data map[string]string) {
+	reader, err := NewReader()
+	if err != nil {
+		log.Fatal("Error opening file:", err)
+	}
+	defer reader.Close()
+
+	for reader.scanner.Scan() {
+		line := reader.scanner.Bytes()
+
+		rec := &record{}
+		if err := json.Unmarshal(line, &rec); err != nil {
+			log.Fatal("Error decoding data from file:", err)
+		}
+		data[rec.ShortURL] = rec.OriginalURL
+	}
+
+	if err := reader.scanner.Err(); err != nil {
+		log.Fatal("Error scanning from file:", err)
+	}
+}
+
+func (em *ExportedManager) GetRecord(short string) (string, error) {
+	reader, err := NewReader()
+	if err != nil {
+		log.Fatal("Error opening file:", err)
+	}
+	defer reader.Close()
+
+	for reader.scanner.Scan() {
+		line := reader.scanner.Bytes()
+
+		rec := &record{}
+		if err := json.Unmarshal(line, &rec); err != nil {
+			log.Fatal("Error decoding data from file:", err)
+		}
+		if rec.ShortURL == short {
+			return rec.OriginalURL, nil
+		}
+	}
+
+	if err := reader.scanner.Err(); err != nil {
+		log.Fatal("Error scanning from file:", err)
+	}
+
+	return "", nil
+}
+
+func (em *ExportedManager) AddRecord(short, url string) error {
+	uuid, err := em.countLines()
+	if err != nil {
+		return err
+	}
+
+	writer, err := NewWriter()
+	if err != nil {
+		return err
+	}
+	defer writer.Close()
+
+	newRecord := record{
+		UUID:        strconv.Itoa(uuid + 1),
+		ShortURL:    short,
+		OriginalURL: url,
+	}
+	recordJSON, err := json.Marshal(newRecord)
+	if err != nil {
+		return err
+	}
+	if _, err := writer.file.WriteString(string(recordJSON) + "\n"); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (em *ExportedManager) AddBatch(batch model.BatchUrls) error {
+	writer, err := NewWriter()
+	if err != nil {
+		return err
+	}
+	defer writer.Close()
+
+	for _, rec := range batch {
+		newRecord := record{
+			UUID:        rec.ID,
+			ShortURL:    rec.Short,
+			OriginalURL: rec.URL,
+		}
+		recordJSON, err := json.Marshal(newRecord)
+		if err != nil {
+			return err
+		}
+		if _, err := writer.file.WriteString(string(recordJSON) + "\n"); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (em *ExportedManager) countLines() (int, error) {
+	reader, err := NewReader()
+	if err != nil {
+		log.Fatal("Error opening file:", err)
+	}
+	defer reader.Close()
+
+	lineCount := 0
+	for reader.scanner.Scan() {
+		lineCount++
+	}
+
+	if err := reader.scanner.Err(); err != nil {
+		log.Fatal("Error scanning from file:", err)
+	}
+
+	return lineCount, nil
+}