From 27806054e03b5ddbc795e6278f55e2e958b50f7b Mon Sep 17 00:00:00 2001 From: Alexander Zavorotynskiy Date: Mon, 8 Aug 2022 15:49:49 +0200 Subject: [PATCH] fix(backend): removed redundant files --- backend/internal/http/player/player.go | 55 ------------ backend/internal/http/player/player_test.go | 10 --- backend/internal/http/recorder/recorder.go | 94 --------------------- backend/pkg/db/postgres/bulk_test.go | 54 ------------ 4 files changed, 213 deletions(-) delete mode 100644 backend/internal/http/player/player.go delete mode 100644 backend/internal/http/player/player_test.go delete mode 100644 backend/internal/http/recorder/recorder.go delete mode 100644 backend/pkg/db/postgres/bulk_test.go diff --git a/backend/internal/http/player/player.go b/backend/internal/http/player/player.go deleted file mode 100644 index 9c4838941..000000000 --- a/backend/internal/http/player/player.go +++ /dev/null @@ -1,55 +0,0 @@ -package player - -import ( - "bufio" - "fmt" - "log" - "os" -) - -type request struct { - ts int64 - method string - url string - headers map[string][]string - body []byte -} - -type playerImpl struct { - // -} - -func (p playerImpl) LoadRecord(filePath string) error { - if filePath == "" { - return fmt.Errorf("file name is empty") - } - file, err := os.OpenFile(filePath, os.O_RDONLY, 0644) - if err != nil { - return fmt.Errorf("open file err: %s", err) - } - defer file.Close() - - sc := bufio.NewScanner(file) - for sc.Scan() { - line := sc.Text() - log.Println(line) - } - if err := sc.Err(); err != nil { - return fmt.Errorf("scan file error: %v", err) - } - return nil -} - -func (p playerImpl) PlayRecord(host string) error { - //TODO implement me - panic("implement me") -} - -type Player interface { - LoadRecord(filePath string) error - PlayRecord(host string) error -} - -func New() Player { - return &playerImpl{} -} diff --git a/backend/internal/http/player/player_test.go b/backend/internal/http/player/player_test.go deleted file mode 100644 index 0aa318095..000000000 --- a/backend/internal/http/player/player_test.go +++ /dev/null @@ -1,10 +0,0 @@ -package player - -import "testing" - -func TestPlayer(t *testing.T) { - player := New() - if err := player.LoadRecord("/Users/alexander/7048055123532800"); err != nil { - t.Logf("can't load session record: %s", err) - } -} diff --git a/backend/internal/http/recorder/recorder.go b/backend/internal/http/recorder/recorder.go deleted file mode 100644 index e6a3ac0f7..000000000 --- a/backend/internal/http/recorder/recorder.go +++ /dev/null @@ -1,94 +0,0 @@ -package recorder - -import ( - "encoding/json" - "fmt" - "log" - "net/http" - "os" - "strconv" - "sync" - "time" -) - -type recorderImpl struct { - sessions map[uint64]*sync.Mutex - sessionsDir string -} - -func (r *recorderImpl) SaveRequest(sessionID uint64, req *http.Request, body []byte) error { - pwd, _ := os.Getwd() - log.Printf("new request, pwd: %s", pwd) - // Hold mutex for session - if _, ok := r.sessions[sessionID]; !ok { - r.sessions[sessionID] = &sync.Mutex{} - } - r.sessions[sessionID].Lock() - // Release mutex for session on exit - defer r.sessions[sessionID].Unlock() - - // Open file - file, err := os.OpenFile(r.sessionsDir+strconv.FormatUint(sessionID, 10), os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644) - if err != nil { - return err - } - // Close file on exit - defer file.Close() - log.Printf("file name: %s", strconv.FormatUint(sessionID, 10)) - - // Save request info - /* - Record format: - - timestamp - - method - - url - - headers - - body - */ - if _, err := file.Write([]byte("\n")); err != nil { - log.Printf("can't write data to file: %s", err) - } - if _, err := file.Write([]byte(fmt.Sprintf("%d\n", time.Now().UnixMilli()))); err != nil { - log.Printf("can't write timestamp to file: %s", err) - } - if _, err := file.Write([]byte(fmt.Sprintf("%s\n", req.Method))); err != nil { - log.Printf("can't write method to file: %s", err) - } - if _, err := file.Write([]byte(fmt.Sprintf("%s\n", req.URL.Path))); err != nil { - log.Printf("can't write url to file: %s", err) - } - reqHeaders, err := json.Marshal(req.Header) - if err == nil { - if _, err := file.Write([]byte(fmt.Sprintf("%s\n", string(reqHeaders)))); err != nil { - log.Printf("can't write headers to file: %s", err) - } - } else { - log.Printf("can't marshal request headers: %s", err) - } - if _, err := file.Write([]byte(fmt.Sprintf("%s\n", string(body)))); err != nil { - log.Printf("can't write body to file: %s", err) - } - if _, err := file.Write([]byte("\n")); err != nil { - log.Printf("can't write data to file: %s", err) - } - - // Sync file changes - if err := file.Sync(); err != nil { - log.Printf("can't sync file: %s", err) - } - return nil -} - -type Recorder interface { - SaveRequest(sessionID uint64, req *http.Request, body []byte) error -} - -func New(dir string) Recorder { - if dir == "" { - dir = "./" - } - return &recorderImpl{ - sessions: make(map[uint64]*sync.Mutex), - sessionsDir: dir, - } -} diff --git a/backend/pkg/db/postgres/bulk_test.go b/backend/pkg/db/postgres/bulk_test.go deleted file mode 100644 index 4e7489684..000000000 --- a/backend/pkg/db/postgres/bulk_test.go +++ /dev/null @@ -1,54 +0,0 @@ -package postgres - -import ( - "fmt" - "github.com/jackc/pgx/v4" - "testing" -) - -type poolMock struct { - // -} - -func (p poolMock) Query(sql string, args ...interface{}) (pgx.Rows, error) { - return nil, nil -} - -func (p poolMock) QueryRow(sql string, args ...interface{}) pgx.Row { - return nil -} - -func (p poolMock) Exec(sql string, arguments ...interface{}) error { - fmt.Println(sql) - fmt.Println(arguments...) - return nil -} - -func (p poolMock) SendBatch(b *pgx.Batch) pgx.BatchResults { - return nil -} - -func (p poolMock) Begin() (*_Tx, error) { - return nil, nil -} - -func (p poolMock) Close() { -} - -func NewPoolMock() Pool { - return &poolMock{} -} - -func TestBulk(t *testing.T) { - conn := NewPoolMock() - bulk, err := NewBulk(conn, "autocomplete", "(value, type, project_id)", "($%d, $%d, $%d)", 3, 10) - if err != nil { - t.Errorf("can't create bulk: %s", err) - } - for i := 0; i < 10; i++ { - if err := bulk.Append(fmt.Sprintf("var1+%d", i), fmt.Sprintf("var2+%d", i), - i%2 == 0); err != nil { - t.Errorf("can't add new values to bulk: %s", err) - } - } -}