Skip to content

Commit b713f16

Browse files
committed
update apigen
1 parent 7368418 commit b713f16

1 file changed

Lines changed: 8 additions & 25 deletions

File tree

.tools/apigen.go

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ import (
6060
6161
"github.com/afteracademy/goserve-example-api-server-postgres/api/%s/dto"
6262
"github.com/afteracademy/goserve-example-api-server-postgres/api/%s/model"
63-
"github.com/afteracademy/goserve/v2/network"
6463
"github.com/afteracademy/goserve/v2/redis"
6564
"github.com/jackc/pgx/v5/pgxpool"
6665
"github.com/google/uuid"
@@ -71,14 +70,12 @@ type Service interface {
7170
}
7271
7372
type service struct {
74-
network.BaseService
7573
db *pgxpool.Pool
7674
info%sCache redis.Cache[dto.Info%s]
7775
}
7876
7977
func NewService(db *pgxpool.Pool, store redis.Store) Service {
8078
return &service{
81-
BaseService: network.NewBaseService(),
8279
db: db,
8380
info%sCache: redis.NewCache[dto.Info%s](store),
8481
}
@@ -137,7 +134,7 @@ import (
137134
)
138135
139136
type controller struct {
140-
network.BaseController
137+
network.Controller
141138
common.ContextPayload
142139
service Service
143140
}
@@ -148,7 +145,7 @@ func NewController(
148145
service Service,
149146
) network.Controller {
150147
return &controller{
151-
BaseController: network.NewBaseController("/%s", authMFunc, authorizeMFunc),
148+
Controller: network.NewController("/%s", authMFunc, authorizeMFunc),
152149
ContextPayload: common.NewContextPayload(),
153150
service: service,
154151
}
@@ -159,25 +156,25 @@ func (c *controller) MountRoutes(group *gin.RouterGroup) {
159156
}
160157
161158
func (c *controller) get%sHandler(ctx *gin.Context) {
162-
uuidParam, err := network.ReqParams(ctx, coredto.EmptyUUID())
159+
uuidParam, err := network.ReqParams[coredto.UUID](ctx)
163160
if err != nil {
164-
c.Send(ctx).BadRequestError(err.Error(), err)
161+
network.SendBadRequestError(ctx, err.Error(), err)
165162
return
166163
}
167164
168165
%s, err := c.service.Find%s(uuidParam.ID)
169166
if err != nil {
170-
c.Send(ctx).NotFoundError("%s not found", err)
167+
network.SendNotFoundError(ctx, "%s not found", err)
171168
return
172169
}
173170
174171
data, err := utility.MapTo[dto.Info%s](%s)
175172
if err != nil {
176-
c.Send(ctx).InternalServerError("something went wrong", err)
173+
network.SendInternalServerError(ctx, "something went wrong", err)
177174
return
178175
}
179176
180-
c.Send(ctx).SuccessDataResponse("success", data)
177+
network.SendSuccessDataResponse(ctx, "success", data)
181178
}
182179
`, featureLower, featureLower, featureLower, featureCaps, featureCaps, featureLower, featureCaps, featureLower, featureCaps, featureLower)
183180

@@ -230,30 +227,16 @@ func generateDto(featureDir, featureName string) error {
230227
import (
231228
"time"
232229
233-
"github.com/go-playground/validator/v10"
234230
"github.com/google/uuid"
235-
"github.com/afteracademy/goserve/v2/utility"
236231
)
237232
238233
type Info%s struct {
239234
ID uuid.UUID ` + "`" + `json:"_id" binding:"required"` + "`" + `
240235
Field string ` + "`" + `json:"field" binding:"required"` + "`" + `
241236
CreatedAt time.Time ` + "`" + `json:"createdAt" binding:"required"` + "`" + `
242237
}
243-
244-
func EmptyInfo%s() *Info%s {
245-
return &Info%s{}
246-
}
247-
248-
func (d *Info%s) GetValue() *Info%s {
249-
return d
250-
}
251-
252-
func (d *Info%s) ValidateErrors(errs validator.ValidationErrors) ([]string, error) {
253-
return utility.FormatValidationErrors(errs), nil
254-
}
255238
`
256-
template := fmt.Sprintf(tStr, featureCaps, featureCaps, featureCaps, featureCaps, featureCaps, featureCaps, featureCaps)
239+
template := fmt.Sprintf(tStr, featureCaps)
257240

258241
return os.WriteFile(dtoPath, []byte(template), os.ModePerm)
259242
}

0 commit comments

Comments
 (0)