Have got asynchronous publishing working

services/posts/create.go

@@ -34,10 +34,7 @@ func (s *Service) PublishPost(ctx context.Context, params CreatePostParams) (*mo
 		return nil, err
 	}
 
-	// TODO: do on separate thread
-	if err := s.publisher.Publish(ctx, site); err != nil {
-		return nil, err
-	}
+	s.publisher.Queue(site)
 
 	return post, nil
 }

services/posts/delete.go

@@ -12,16 +12,9 @@ const (
 )
 
 func (s *Service) DeletePost(ctx context.Context, pid int64, hardDelete bool) error {
-	site, ok := models.GetSite(ctx)
-	if !ok {
-		return models.SiteRequiredError
-	}
-
-	post, err := s.db.SelectPost(ctx, pid)
+	post, site, err := s.fetchPostAndSite(ctx, pid)
 	if err != nil {
 		return err
-	} else if post.SiteID != site.ID {
-		return models.NotFoundError
 	}
 
 	if hardDelete && post.DeletedAt.Unix() > 0 {
@@ -30,17 +23,45 @@ func (s *Service) DeletePost(ctx context.Context, pid int64, hardDelete bool) er
 			return models.DeleteDebounceError
 		}
 
-		return s.db.HardDeletePost(ctx, post.ID)
+		if err := s.db.HardDeletePost(ctx, post.ID); err != nil {
+			return err
+		}
+	} else {
+		if err := s.db.SoftDeletePost(ctx, post.ID); err != nil {
+			return err
+		}
 	}
 
-	return s.db.SoftDeletePost(ctx, post.ID)
+	s.publisher.Queue(site)
+
+	return nil
 }
 
 func (s *Service) RestorePost(ctx context.Context, pid int64) error {
-	post, err := s.db.SelectPost(ctx, pid)
+	post, site, err := s.fetchPostAndSite(ctx, pid)
 	if err != nil {
 		return err
 	}
 
-	return s.db.RestorePost(ctx, post.ID)
+	if err := s.db.RestorePost(ctx, post.ID); err != nil {
+		return err
+	}
+
+	s.publisher.Queue(site)
+	return nil
+}
+
+func (s *Service) fetchPostAndSite(ctx context.Context, pid int64) (*models.Post, models.Site, error) {
+	site, ok := models.GetSite(ctx)
+	if !ok {
+		return nil, models.Site{}, models.SiteRequiredError
+	}
+
+	post, err := s.db.SelectPost(ctx, pid)
+	if err != nil {
+		return nil, models.Site{}, err
+	} else if post.SiteID != site.ID {
+		return nil, models.Site{}, models.NotFoundError
+	}
+	return post, site, nil
 }

services/posts/list.go

@@ -21,16 +21,9 @@ func (s *Service) ListPosts(ctx context.Context, showDeleted bool) ([]*models.Po
 }
 
 func (s *Service) GetPost(ctx context.Context, pid int64) (*models.Post, error) {
-	site, ok := models.GetSite(ctx)
-	if !ok {
-		return nil, models.SiteRequiredError
-	}
-
-	post, err := s.db.SelectPost(ctx, pid)
+	post, _, err := s.fetchPostAndSite(ctx, pid)
 	if err != nil {
 		return nil, err
-	} else if post.SiteID != site.ID {
-		return nil, models.NotFoundError
 	}
 
 	return post, nil

services/posts/service.go

@@ -7,10 +7,10 @@ import (
 
 type Service struct {
 	db        *db.Provider
-	publisher *publisher.Publisher
+	publisher *publisher.Queue
 }
 
-func New(db *db.Provider, publisher *publisher.Publisher) *Service {
+func New(db *db.Provider, publisher *publisher.Queue) *Service {
 	return &Service{
 		db:        db,
 		publisher: publisher,