update public api

factly · Jul 8, 2024 · e664029 · e664029
1 parent 70c6a88
commit e664029
Show file tree

Hide file tree

Showing 23 changed files with 52 additions and 47 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -172,6 +172,7 @@ services:
       - 7789:8000
       - 7788:8001
       - 7787:8002
+      - 7786:8004
     build:
       context: ./server
       dockerfile: Dockerfile.dev

diff --git a/server/cmd/serve.go b/server/cmd/serve.go
@@ -65,6 +65,11 @@ var serveCmd = &cobra.Command{
 			}()
 		}
 
+		go func() {
+			r := service.RegisterPublicRoutes()
+			log.Fatal(http.ListenAndServe(":8004", r))
+		}()
+
 		if err := http.ListenAndServe(":8000", r); err != nil {
 			log.Fatal(err)
 		}

diff --git a/server/config/redis.go b/server/config/redis.go
@@ -139,7 +139,6 @@ type requestBody struct {
 
 func CachingMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-
 		body := requestBody{}
 		spaceId := r.Header.Get("x-space")
 		bodyBytes, _ := io.ReadAll(r.Body)

diff --git a/server/service/core/action/page/create.go b/server/service/core/action/page/create.go
@@ -145,7 +145,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 	tx.Model(&model.Post{}).Preload("Medium").Preload("Format").Preload("Tags").Preload("Categories").First(&result.Post)
 
 	// fetch all authors
-	authors, err := util.GetAuthors(authCtx.OrganisationID, page.AuthorIDs)
+	authors, err := util.GetAuthors(r.Header.Get("Authorization"), authCtx.OrganisationID, page.AuthorIDs)
 
 	if err != nil {
 		loggerx.Error(err)

diff --git a/server/service/core/action/page/details.go b/server/service/core/action/page/details.go
@@ -70,7 +70,7 @@ func details(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Adding author
-	authors, err := util.GetAuthors(authCtx.OrganisationID, authorIds)
+	authors, err := util.GetAuthors(r.Header.Get("Authorization"), authCtx.OrganisationID, authorIds)
 
 	if err != nil {
 		loggerx.Error(err)

diff --git a/server/service/core/action/page/update.go b/server/service/core/action/page/update.go
@@ -89,7 +89,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// fetch all authors
-	authors, err := util.GetAuthors(authCtx.OrganisationID, page.AuthorIDs)
+	authors, err := util.GetAuthors(r.Header.Get("Authorization"), authCtx.OrganisationID, page.AuthorIDs)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))

diff --git a/server/service/core/action/post/create.go b/server/service/core/action/post/create.go
@@ -169,6 +169,7 @@ func createPost(ctx context.Context, post post, status string, r *http.Request)
 		DescriptionAMP:   post.DescriptionAMP,
 		MigratedHTML:     post.MigratedHTML,
 		Language:         post.Language,
+		CustomFormat:     post.CustomFormat,
 	}
 
 	if post.MigrationID != nil {
@@ -234,7 +235,7 @@ func createPost(ctx context.Context, post post, status string, r *http.Request)
 		}
 	}
 
-	authors, err := util.GetAuthors(authCtx.OrganisationID, post.AuthorIDs)
+	authors, err := util.GetAuthors(r.Header.Get("Authorization"), authCtx.OrganisationID, post.AuthorIDs)
 	if err != nil {
 		loggerx.Error(err)
 		return nil, errorx.InternalServerError()

diff --git a/server/service/core/action/post/details.go b/server/service/core/action/post/details.go
@@ -88,7 +88,7 @@ func details(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Adding author
-	authors, err := util.GetAuthors(authCtx.OrganisationID, authorIDs)
+	authors, err := util.GetAuthors(r.Header.Get("Authorization"), authCtx.OrganisationID, authorIDs)
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.InternalServerError()))

diff --git a/server/service/core/action/post/feed.go b/server/service/core/action/post/feed.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/service/core/model"
-	"github.com/factly/dega-server/util"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
 	"github.com/factly/x/paginationx"
@@ -97,7 +96,7 @@ func GetItemsList(postList []model.Post, space model.Space) []*feeds.Item {
 			authorIDs = append(authorIDs, po.AuthorID)
 		}
 	}
-	authorMap, _ := util.GetAuthors("", authorIDs)
+	authorMap := make(map[string]model.Author)
 
 	// generate post author map
 	postAuthorMap := make(map[uuid.UUID][]string)

diff --git a/server/service/core/action/post/list.go b/server/service/core/action/post/list.go
@@ -177,7 +177,7 @@ func list(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// fetch all authors
-	authors, err := util.GetAuthors(authCtx.OrganisationID, authorIDs)
+	authors, err := util.GetAuthors(r.Header.Get("Authorization"), authCtx.OrganisationID, authorIDs)
 
 	if err != nil {
 		loggerx.Error(err)
@@ -333,26 +333,26 @@ func PublicList(w http.ResponseWriter, r *http.Request) {
 
 	posts := make([]model.Post, 0)
 
-	order := "posts." + pageSortBy + " " + pageSortOrder
+	order := "de_post." + pageSortBy + " " + pageSortOrder
 
 	tx := config.DB.Model(&model.Post{})
 
 	tx.Preload("Tags").
 		Preload("Categories").
 		Preload("Medium").
 		Preload("Format").
-		Joins("JOIN post_tag ON post_tag.post_id = posts.id").
-		Joins("JOIN post_category ON post_category.post_id = posts.id").
-		Joins("JOIN post_author ON post_author.post_id = posts.id").
-		Where("posts.space_id = ?", authCtx.SpaceID).
-		Where("post_tag.tag_id IN ?", tagUUIDs).
-		Where("post_category.category_id IN ?", categoryUUIDs).
-		Where("post_author.author_id IN ?", authorIds).
-		Where("posts.format_id IN ?", formatUUIDs).
-		Where("posts.id IN ?", uuids).
-		Where("posts.is_page = ?", isPageBool).
-		Where("posts.status = ?", status).
-		Where("posts.is_featured = ?", isFeaturedBool).
+		Joins("JOIN de_post_tags ON de_post_tags.post_id = de_post.id").
+		Joins("JOIN de_post_categories ON de_post_categories.post_id = de_post.id").
+		Joins("JOIN de_post_author ON de_post_author.post_id = de_post.id").
+		Where("de_post.space_id = ?", authCtx.SpaceID).
+		Where("de_post_tags.tag_id IN ?", tagUUIDs).
+		Where("de_post_categories.category_id IN ?", categoryUUIDs).
+		Where("de_post_author.author_id IN ?", authorIds).
+		Where("de_post.format_id IN ?", formatUUIDs).
+		Where("de_post.id IN ?", uuids).
+		Where("de_post.is_page = ?", isPageBool).
+		Where("de_post.status = ?", status).
+		Where("de_post.is_featured = ?", isFeaturedBool).
 		Count(&result.Total).
 		Limit(limit).
 		Offset(offset).

diff --git a/server/service/core/action/post/route.go b/server/service/core/action/post/route.go
@@ -44,6 +44,7 @@ type post struct {
 	TagIDs           []uuid.UUID    `json:"tag_ids"`
 	ClaimIDs         []uuid.UUID    `json:"claim_ids"`
 	AuthorIDs        []string       `json:"author_ids"`
+	CustomFormat     string         `json:"custom_format"`
 }
 
 type postData struct {

diff --git a/server/service/core/action/post/update.go b/server/service/core/action/post/update.go
@@ -84,7 +84,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 	result.Claims = make([]factCheckModel.Claim, 0)
 
 	// fetch all authors
-	authors, err := util.GetAuthors(authCtx.OrganisationID, post.AuthorIDs)
+	authors, err := util.GetAuthors(r.Header.Get("Authorization"), authCtx.OrganisationID, post.AuthorIDs)
 
 	if err != nil {
 		loggerx.Error(err)
@@ -189,6 +189,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 		"description_amp":    post.DescriptionAMP,
 		"migrated_html":      post.MigratedHTML,
 		"language":           post.Language,
+		"custom_format":      post.CustomFormat,
 	}
 
 	if post.MigrationID != nil {

diff --git a/server/service/core/model/post.go b/server/service/core/model/post.go
@@ -42,6 +42,7 @@ type Post struct {
 	MetaFields       postgres.Jsonb `gorm:"column:meta_fields" json:"meta_fields" swaggertype:"primitive,string"`
 	Tags             []Tag          `gorm:"many2many:post_tags;" json:"tags"`
 	Categories       []Category     `gorm:"many2many:post_categories;" json:"categories"`
+	CustomFormat     string         `gorm:"column:custom_format" json:"custom_format"`
 }
 
 // PostAuthor model

diff --git a/server/service/core/route.go b/server/service/core/route.go
@@ -59,6 +59,7 @@ func PublicRouter() http.Handler {
 	r.Get("/tags", tag.PublicList)
 	r.Get("/formats", format.List)
 	r.Get("/authors", author.PublicList)
+	r.Get("/posts", post.PublicList)
 
 	return r
 }
diff --git a/server/service/core/service/category.go b/server/service/core/service/category.go
@@ -157,12 +157,10 @@ func (cs CategoryService) PublicList(sID uuid.UUID, offset, limit int, searchQue
 
 	order := pageSortBy + " " + pageSortOrder
 
-	var tx *gorm.DB
+	tx := config.DB.Model(&model.Category{})
 
 	if len(ids) > 0 {
 		tx = tx.Model(&model.Category{}).Where(ids)
-	} else {
-		tx = tx.Model(&model.Category{})
 	}
 
 	if searchQuery != "" {

diff --git a/server/service/core/service/tag.go b/server/service/core/service/tag.go
@@ -155,7 +155,7 @@ func (ts TagService) PublicList(sID uuid.UUID, offset, limit int, searchQuery, s
 
 	order := pageSortBy + " " + pageSortOrder
 
-	var tx *gorm.DB
+	tx := config.DB.Model(&model.Tag{})
 
 	if len(ids) > 0 {
 		tx = tx.Model(&model.Tag{}).Where(ids)

diff --git a/server/service/podcast/action/episode/create.go b/server/service/podcast/action/episode/create.go
@@ -47,7 +47,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 
 	episodeService := service.GetEpisodeService()
 
-	result, serviceErr := episodeService.Create(r.Context(), authCtx.SpaceID, authCtx.UserID, authCtx.OrganisationID, episode)
+	result, serviceErr := episodeService.Create(r.Context(), authCtx.SpaceID, authCtx.UserID, authCtx.OrganisationID, r.Header.Get("Authorization"), episode)
 	if serviceErr != nil {
 		errorx.Render(w, serviceErr)
 		return

diff --git a/server/service/podcast/action/episode/delete.go b/server/service/podcast/action/episode/delete.go
@@ -43,7 +43,7 @@ func delete(w http.ResponseWriter, r *http.Request) {
 
 	episodeService := service.GetEpisodeService()
 
-	result, serviceErr := episodeService.GetById(r.Context(), authCtx.SpaceID, id, authCtx.OrganisationID)
+	result, serviceErr := episodeService.GetById(r.Context(), authCtx.SpaceID, id, authCtx.OrganisationID, r.Header.Get("Authorization"))
 
 	if serviceErr != nil {
 		errorx.Render(w, serviceErr)

diff --git a/server/service/podcast/action/episode/details.go b/server/service/podcast/action/episode/details.go
@@ -43,7 +43,7 @@ func details(w http.ResponseWriter, r *http.Request) {
 
 	episodeService := service.GetEpisodeService()
 
-	result, serviceErr := episodeService.GetById(r.Context(), authCtx.SpaceID, id, authCtx.OrganisationID)
+	result, serviceErr := episodeService.GetById(r.Context(), authCtx.SpaceID, id, authCtx.OrganisationID, r.Header.Get("Authorization"))
 	if serviceErr != nil {
 		errorx.Render(w, serviceErr)
 		return

diff --git a/server/service/podcast/action/episode/update.go b/server/service/podcast/action/episode/update.go
@@ -56,7 +56,7 @@ func update(w http.ResponseWriter, r *http.Request) {
 	}
 	episodeService := service.GetEpisodeService()
 
-	result, serviceErr := episodeService.Update(r.Context(), authCtx.SpaceID, id, authCtx.UserID, authCtx.OrganisationID, episode)
+	result, serviceErr := episodeService.Update(r.Context(), authCtx.SpaceID, id, authCtx.UserID, authCtx.OrganisationID, r.Header.Get("Authorization"), episode)
 	if serviceErr != nil {
 		errorx.Render(w, serviceErr)
 		return

diff --git a/server/service/podcast/service/episode.go b/server/service/podcast/service/episode.go
@@ -53,10 +53,10 @@ type episodePaging struct {
 }
 
 type IEpisodeService interface {
-	GetById(ctx context.Context, sID, id uuid.UUID, oID string) (model.Episode, []errorx.Message)
+	GetById(ctx context.Context, sID, id uuid.UUID, oID, token string) (model.Episode, []errorx.Message)
 	List(ctx context.Context, sID uuid.UUID, offset, limit int, searchQuery, sort string, queryMap url.Values) (episodePaging, []errorx.Message)
-	Create(ctx context.Context, sID uuid.UUID, uID, oID string, episode *Episode) (EpisodeData, []errorx.Message)
-	Update(ctx context.Context, sID, id uuid.UUID, uID, oID string, episode *Episode) (EpisodeData, []errorx.Message)
+	Create(ctx context.Context, sID uuid.UUID, uID, oID, token string, episode *Episode) (EpisodeData, []errorx.Message)
+	Update(ctx context.Context, sID, id uuid.UUID, uID, oID, token string, episode *Episode) (EpisodeData, []errorx.Message)
 	Delete(sID, id uuid.UUID) []errorx.Message
 }
 
@@ -65,7 +65,7 @@ type episodeService struct {
 }
 
 // Create implements IEpisodeService
-func (es *episodeService) Create(ctx context.Context, sID uuid.UUID, uID, oID string, episode *Episode) (EpisodeData, []errorx.Message) {
+func (es *episodeService) Create(ctx context.Context, sID uuid.UUID, uID, oID, token string, episode *Episode) (EpisodeData, []errorx.Message) {
 
 	validationError := validationx.Check(episode)
 
@@ -141,7 +141,7 @@ func (es *episodeService) Create(ctx context.Context, sID uuid.UUID, uID, oID st
 	}
 
 	if len(episode.AuthorIDs) > 0 {
-		authorMap, err := util.GetAuthors(oID, episode.AuthorIDs)
+		authorMap, err := util.GetAuthors(token, oID, episode.AuthorIDs)
 		if err != nil {
 			tx.Rollback()
 			loggerx.Error(err)
@@ -195,7 +195,7 @@ func (es *episodeService) Delete(sID, id uuid.UUID) []errorx.Message {
 }
 
 // GetById implements IEpisodeService
-func (es *episodeService) GetById(ctx context.Context, sID, id uuid.UUID, oId string) (model.Episode, []errorx.Message) {
+func (es *episodeService) GetById(ctx context.Context, sID, id uuid.UUID, oId, token string) (model.Episode, []errorx.Message) {
 
 	result := EpisodeData{}
 
@@ -222,7 +222,7 @@ func (es *episodeService) GetById(ctx context.Context, sID, id uuid.UUID, oId st
 	}
 
 	// Adding authors in response
-	authorMap, err := util.GetAuthors(oId, authorIds)
+	authorMap, err := util.GetAuthors(token, oId, authorIds)
 	if err != nil {
 		loggerx.Error(err)
 		return result.Episode, errorx.Parser(errorx.DBError())
@@ -325,7 +325,7 @@ func (es *episodeService) List(ctx context.Context, sID uuid.UUID, offset, limit
 }
 
 // Update implements IEpisodeService
-func (es *episodeService) Update(ctx context.Context, sID, id uuid.UUID, uID, oID string, episode *Episode) (EpisodeData, []errorx.Message) {
+func (es *episodeService) Update(ctx context.Context, sID, id uuid.UUID, uID, oID, token string, episode *Episode) (EpisodeData, []errorx.Message) {
 
 	validationError := validationx.Check(episode)
 
@@ -444,7 +444,7 @@ func (es *episodeService) Update(ctx context.Context, sID, id uuid.UUID, uID, oI
 	}
 
 	// Fetch current authors
-	authorMap, err := util.GetAuthors(oID, episode.AuthorIDs)
+	authorMap, err := util.GetAuthors(token, oID, episode.AuthorIDs)
 	if err != nil {
 		loggerx.Error(err)
 		return EpisodeData{}, errorx.Parser(errorx.DBError())

diff --git a/server/service/route.go b/server/service/route.go
@@ -98,16 +98,14 @@ func RegisterPublicRoutes() http.Handler {
 		"meilisearch": util.MeiliChecker,
 	})
 
-	r.Use(util.CheckAPIAcess)
-
 	if config.CacheEnabled() {
 		config.SetupCache()
 		r.Use(config.CachingMiddleware, config.RespMiddleware)
 	}
-
-	r.Mount("/core", core.PublicRouter())
-	r.Mount("/fact-check", factCheck.PublicRouter())
-
+	r.With(util.CheckAPIAcess).Group(func(r chi.Router) {
+		r.Mount("/core", core.PublicRouter())
+		r.Mount("/fact-check", factCheck.PublicRouter())
+	})
 	return r
 }
 

diff --git a/server/util/authors.go b/server/util/authors.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-func GetAuthors(orgID string, ids []string) (map[string]model.Author, error) {
+func GetAuthors(token, orgID string, ids []string) (map[string]model.Author, error) {
 	zitadelUsers, err := zitadel.GetOrganisationUsers(viper.GetString("ZITADEL_PERSONAL_ACCESS_TOKEN"), orgID, ids)
 
 	if err != nil {