From e79ad4bcd878b7a3c53d4e8e26a75d0f85cd00e4 Mon Sep 17 00:00:00 2001 From: hanif salafi Date: Mon, 3 Feb 2025 09:35:45 +0700 Subject: [PATCH] feat: update article & category host for url --- .../service/article_categories.service.go | 7 +++---- app/module/articles/mapper/articles.mapper.go | 2 +- app/module/articles/service/articles.service.go | 6 ++---- config/toml/config.toml | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/module/article_categories/service/article_categories.service.go b/app/module/article_categories/service/article_categories.service.go index 1b39195..33f1427 100644 --- a/app/module/article_categories/service/article_categories.service.go +++ b/app/module/article_categories/service/article_categories.service.go @@ -65,9 +65,9 @@ func (_i *articleCategoriesService) All(req request.ArticleCategoriesQueryReques } host := _i.Cfg.App.Domain - port := _i.Cfg.App.ExternalPort + for _, result := range results { - articleCategoriess = append(articleCategoriess, mapper.ArticleCategoriesResponseMapper(result, host+port)) + articleCategoriess = append(articleCategoriess, mapper.ArticleCategoriesResponseMapper(result, host)) } return @@ -79,8 +79,7 @@ func (_i *articleCategoriesService) Show(id uint) (articleCategories *response.A return nil, err } host := _i.Cfg.App.Domain - port := _i.Cfg.App.ExternalPort - return mapper.ArticleCategoriesResponseMapper(result, host+port), nil + return mapper.ArticleCategoriesResponseMapper(result, host), nil } func (_i *articleCategoriesService) Save(req request.ArticleCategoriesCreateRequest, authToken string) (articleCategories *entity.ArticleCategories, err error) { diff --git a/app/module/articles/mapper/articles.mapper.go b/app/module/articles/mapper/articles.mapper.go index 621bef2..3dc0b6b 100644 --- a/app/module/articles/mapper/articles.mapper.go +++ b/app/module/articles/mapper/articles.mapper.go @@ -37,7 +37,7 @@ func ArticlesResponseMapper( var articleCategoriesArr []*articleCategoriesResponse.ArticleCategoriesResponse if articleCategories != nil && len(articleCategories) > 0 { for _, result := range articleCategories { - articleCategoriesArr = append(articleCategoriesArr, articleCategoriesMapper.ArticleCategoriesResponseMapper(result.Category, "")) + articleCategoriesArr = append(articleCategoriesArr, articleCategoriesMapper.ArticleCategoriesResponseMapper(result.Category, host)) } log.Info().Interface("articleCategoriesArr", articleCategoriesArr).Msg("") } diff --git a/app/module/articles/service/articles.service.go b/app/module/articles/service/articles.service.go index d6d5b63..b45e22d 100644 --- a/app/module/articles/service/articles.service.go +++ b/app/module/articles/service/articles.service.go @@ -89,10 +89,9 @@ func (_i *articlesService) All(req request.ArticlesQueryRequest) (articless []*r Interface("results", results).Msg("") host := _i.Cfg.App.Domain - port := _i.Cfg.App.ExternalPort for _, result := range results { - articleRes := mapper.ArticlesResponseMapper(_i.Log, host+port, result, _i.ArticleCategoriesRepo, _i.ArticleCategoryDetailsRepo, _i.ArticleFilesRepo, _i.UsersRepo) + articleRes := mapper.ArticlesResponseMapper(_i.Log, host, result, _i.ArticleCategoriesRepo, _i.ArticleCategoryDetailsRepo, _i.ArticleFilesRepo, _i.UsersRepo) articless = append(articless, articleRes) } @@ -106,9 +105,8 @@ func (_i *articlesService) Show(id uint) (articles *response.ArticlesResponse, e } host := _i.Cfg.App.Domain - port := _i.Cfg.App.ExternalPort - return mapper.ArticlesResponseMapper(_i.Log, host+port, result, _i.ArticleCategoriesRepo, _i.ArticleCategoryDetailsRepo, _i.ArticleFilesRepo, _i.UsersRepo), nil + return mapper.ArticlesResponseMapper(_i.Log, host, result, _i.ArticleCategoriesRepo, _i.ArticleCategoryDetailsRepo, _i.ArticleFilesRepo, _i.UsersRepo), nil } func (_i *articlesService) Save(req request.ArticlesCreateRequest, authToken string) (articles *entity.Articles, err error) { diff --git a/config/toml/config.toml b/config/toml/config.toml index 24b94c2..8676e77 100644 --- a/config/toml/config.toml +++ b/config/toml/config.toml @@ -3,7 +3,7 @@ name = "Fiber starter" host = "http://38.47.180.165" port = ":8800" -domain = "http://38.47.180.165" +domain = "https://kontenhumas.com/api" external-port = ":8802" idle-timeout = 5 # As seconds print-routes = false