Merge pull request #65 from go-park-mail-ru/revert-64-TP-easyjson

Revert "Tp easyjson"
go-park-mail-ru · Dec 18, 2024 · 094daa0 · 094daa0
2 parents 4abf308 + cce2a17
commit 094daa0
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 1,621 deletions.
diff --git a/Makefile b/Makefile
@@ -6,8 +6,6 @@ MAIN_PATH=./cmd/app
 
 GOTMPDIR=./tmp
 
-EASYJSON=easyjson
-
 build:
 	mkdir -p $(BIN_DIR)
 	GOTMPDIR=$(GOTMPDIR) go build -o $(BIN_DIR)/$(BINARY_NAME) $(MAIN_PATH)
@@ -27,8 +25,4 @@ run: build
 swagger:
 	swag init -g $(MAIN_PATH)/main.go -o ./docs
 
-generate:
-	@echo "Generating easyjson files..."
-	@find . -name '*.go' -exec $(EASYJSON) -all {} \;
-
 .PHONY: build test clean run swagger
diff --git a/internal/delivery/http/utils/httpJSON.go b/internal/delivery/http/utils/httpJSON.go
diff --git a/internal/entity/dto/advert.go b/internal/entity/dto/advert.go
@@ -1,4 +1,3 @@
-//go:generate easyjson -all .
 package dto
 
 import (
@@ -7,7 +6,6 @@ import (
 	"github.com/google/uuid"
 )
 
-//easyjson:json
 type AdvertRequest struct {
 	CategoryId  uuid.UUID    `json:"category_id"`
 	Title       string       `json:"title"`
@@ -18,7 +16,6 @@ type AdvertRequest struct {
 	Location    string       `json:"location"`
 }
 
-//easyjson:json
 type PreviewAdvert struct {
 	ID            uuid.UUID    `json:"id"`
 	SellerId      uuid.UUID    `json:"seller_id"`
@@ -32,21 +29,18 @@ type PreviewAdvert struct {
 	PromotedUntil time.Time    `json:"promoted_until"`
 }
 
-//easyjson:json
 type PreviewAdvertCard struct {
 	Preview  PreviewAdvert `json:"preview"`
 	IsSaved  bool          `json:"is_saved"`
 	IsViewed bool          `json:"is_viewed"`
 }
 
-//easyjson:json
 type MyPreviewAdvertCard struct {
 	Preview     PreviewAdvert `json:"preview"`
 	ViewsNumber uint          `json:"views_number"`
 	SavesNumber uint          `json:"saves_number"`
 }
 
-//easyjson:json
 type Advert struct {
 	ID            uuid.UUID    `json:"id"`
 	SellerId      uuid.UUID    `json:"seller_id"`
@@ -65,7 +59,6 @@ type Advert struct {
 	PromotedUntil time.Time    `json:"promoted_until"`
 }
 
-//easyjson:json
 type AdvertCard struct {
 	Advert   Advert `json:"advert"`
 	IsSaved  bool   `json:"is_saved"`

diff --git a/internal/entity/dto/advert_easyjson.go b/internal/entity/dto/advert_easyjson.go
diff --git a/internal/entity/dto/auth.go b/internal/entity/dto/auth.go
@@ -1,19 +1,15 @@
-//go:generate easyjson -all .
 package dto
 
-//easyjson:json
 type Signup struct {
 	Email    string `json:"email"`
 	Password string `json:"password"`
 }
 
-//easyjson:json
 type Login struct {
 	Email    string `json:"email"`
 	Password string `json:"password"`
 }
 
-//easyjson:json
 type UpdatePassword struct {
 	OldPassword string `json:"old_password"`
 	NewPassword string `json:"new_password"`