chore: get resource blob optional (#991)

api/resource.go

@@ -40,6 +40,7 @@ type ResourceFind struct {
 	// Domain specific fields
 	Filename *string `json:"filename"`
 	MemoID   *int
+	GetBlob  bool
 }
 
 type ResourcePatch struct {

server/resource.go

@@ -153,6 +153,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 		resourceFind := &api.ResourceFind{
 			ID:        &resourceID,
 			CreatorID: &userID,
+			GetBlob:   true,
 		}
 		resource, err := s.Store.FindResource(ctx, resourceFind)
 		if err != nil {
@@ -180,6 +181,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 		resourceFind := &api.ResourceFind{
 			ID:        &resourceID,
 			CreatorID: &userID,
+			GetBlob:   true,
 		}
 		resource, err := s.Store.FindResource(ctx, resourceFind)
 		if err != nil {
@@ -290,6 +292,7 @@ func (s *Server) registerResourcePublicRoutes(g *echo.Group) {
 		resourceFind := &api.ResourceFind{
 			ID:       &resourceID,
 			Filename: &filename,
+			GetBlob:  true,
 		}
 		resource, err := s.Store.FindResource(ctx, resourceFind)
 		if err != nil {

server/server.go

@@ -98,9 +98,6 @@ func NewServer(ctx context.Context, profile *profile.Profile) (*Server, error) {
 	rootGroup := e.Group("")
 	s.registerRSSRoutes(rootGroup)
 
-	webhookGroup := e.Group("/h")
-	s.registerResourcePublicRoutes(webhookGroup)
-
 	publicGroup := e.Group("/o")
 	s.registerResourcePublicRoutes(publicGroup)
 	registerGetterPublicRoutes(publicGroup)

store/resource.go

@@ -295,21 +295,18 @@ func findResourceList(ctx context.Context, tx *sql.Tx, find *api.ResourceFind) (
 		where, args = append(where, "id in (SELECT resource_id FROM memo_resource WHERE memo_id = ?)"), append(args, *v)
 	}
 
-	query := `
+	fields := []string{"id", "filename", "external_link", "type", "size", "creator_id", "created_ts", "updated_ts"}
+	if find.GetBlob {
+		fields = append(fields, "blob")
+	}
+
+	query := fmt.Sprintf(`
 		SELECT
-			id,
+			%s
-			filename,
-			blob,
-			external_link,
-			type,
-			size,
-			creator_id,
-			created_ts,
-			updated_ts
 		FROM resource
-		WHERE ` + strings.Join(where, " AND ") + `
+		WHERE %s
 		ORDER BY id DESC
-	`
+	`, strings.Join(fields, ", "), strings.Join(where, " AND "))
 	rows, err := tx.QueryContext(ctx, query, args...)
 	if err != nil {
 		return nil, FormatError(err)
@@ -319,16 +316,21 @@ func findResourceList(ctx context.Context, tx *sql.Tx, find *api.ResourceFind) (
 	resourceRawList := make([]*resourceRaw, 0)
 	for rows.Next() {
 		var resourceRaw resourceRaw
-		if err := rows.Scan(
+		dest := []interface{}{
 			&resourceRaw.ID,
 			&resourceRaw.Filename,
-			&resourceRaw.Blob,
 			&resourceRaw.ExternalLink,
 			&resourceRaw.Type,
 			&resourceRaw.Size,
 			&resourceRaw.CreatorID,
 			&resourceRaw.CreatedTs,
 			&resourceRaw.UpdatedTs,
+		}
+		if find.GetBlob {
+			dest = append(dest, &resourceRaw.Blob)
+		}
+		if err := rows.Scan(
+			dest...,
 		); err != nil {
 			return nil, FormatError(err)
 		}