chore: revert "feat: add visibility field to resource (#743)" (#751)

Revert "feat: add `visibility` field to resource (#743)"

This reverts commit b68cc08592.

api/resource.go

@@ -13,7 +13,6 @@ type Resource struct {
 	Blob     []byte `json:"-"`
 	Type     string `json:"type"`
 	Size     int64  `json:"size"`
-	Visibility Visibility `json:"visibility"`
 
 	// Related fields
 	LinkedMemoAmount int `json:"linkedMemoAmount"`
@@ -28,7 +27,6 @@ type ResourceCreate struct {
 	Blob     []byte `json:"blob"`
 	Type     string `json:"type"`
 	Size     int64  `json:"size"`
-	Visibility Visibility `json:"visibility"`
 }
 
 type ResourceFind struct {
@@ -40,7 +38,6 @@ type ResourceFind struct {
 	// Domain specific fields
 	Filename *string `json:"filename"`
 	MemoID   *int
-	Visibility *Visibility `json:"visibility"`
 }
 
 type ResourcePatch struct {
@@ -51,7 +48,6 @@ type ResourcePatch struct {
 
 	// Domain specific fields
 	Filename *string `json:"filename"`
-	Visibility *Visibility `json:"visibility"`
 }
 
 type ResourceDelete struct {

store/db/migration/dev/LATEST__SCHEMA.sql

@@ -75,8 +75,7 @@ CREATE TABLE resource (
   blob BLOB DEFAULT NULL,
   external_link TEXT NOT NULL DEFAULT '',
   type TEXT NOT NULL DEFAULT '',
-  size INTEGER NOT NULL DEFAULT 0,
+  size INTEGER NOT NULL DEFAULT 0
-  visibility TEXT NOT NULL CHECK (visibility IN ('PUBLIC', 'PROTECTED', 'PRIVATE')) DEFAULT 'PRIVATE'
 );
 
 -- memo_resource

store/db/migration/prod/0.9/00__resource_visibility.sql

@@ -1,2 +0,0 @@
--- Add visibility field to resource
-ALTER TABLE resource ADD COLUMN visibility TEXT NOT NULL CHECK (visibility IN ('PUBLIC', 'PROTECTED' 'PRIVATE')) DEFAULT 'PRIVATE';

store/resource.go

@@ -26,7 +26,6 @@ type resourceRaw struct {
 	Blob     []byte
 	Type     string
 	Size     int64
-	Visibility api.Visibility
 }
 
 func (raw *resourceRaw) toResource() *api.Resource {
@@ -43,7 +42,6 @@ func (raw *resourceRaw) toResource() *api.Resource {
 		Blob:     raw.Blob,
 		Type:     raw.Type,
 		Size:     raw.Size,
-		Visibility: raw.Visibility,
 	}
 }
 
@@ -219,20 +217,18 @@ func createResource(ctx context.Context, tx *sql.Tx, create *api.ResourceCreate)
 			blob,
 			type,
 			size,
-			visibility,
 			creator_id
 		)
-		VALUES (?, ?, ?, ?, ?, ?)
+		VALUES (?, ?, ?, ?, ?)
-		RETURNING id, filename, blob, type, size, visibility, creator_id, created_ts, updated_ts
+		RETURNING id, filename, blob, type, size, creator_id, created_ts, updated_ts
 	`
 	var resourceRaw resourceRaw
-	if err := tx.QueryRowContext(ctx, query, create.Filename, create.Blob, create.Type, create.Size, create.Visibility, create.CreatorID).Scan(
+	if err := tx.QueryRowContext(ctx, query, create.Filename, create.Blob, create.Type, create.Size, create.CreatorID).Scan(
 		&resourceRaw.ID,
 		&resourceRaw.Filename,
 		&resourceRaw.Blob,
 		&resourceRaw.Type,
 		&resourceRaw.Size,
-		&resourceRaw.Visibility,
 		&resourceRaw.CreatorID,
 		&resourceRaw.CreatedTs,
 		&resourceRaw.UpdatedTs,
@@ -252,9 +248,6 @@ func patchResource(ctx context.Context, tx *sql.Tx, patch *api.ResourcePatch) (*
 	if v := patch.Filename; v != nil {
 		set, args = append(set, "filename = ?"), append(args, *v)
 	}
-	if v := patch.Visibility; v != nil {
-		set, args = append(set, "visibility = ?"), append(args, *v)
-	}
 
 	args = append(args, patch.ID)
 
@@ -262,7 +255,7 @@ func patchResource(ctx context.Context, tx *sql.Tx, patch *api.ResourcePatch) (*
 		UPDATE resource
 		SET ` + strings.Join(set, ", ") + `
 		WHERE id = ?
-		RETURNING id, filename, blob, type, size, visibility, creator_id, created_ts, updated_ts
+		RETURNING id, filename, blob, type, size, creator_id, created_ts, updated_ts
 	`
 	var resourceRaw resourceRaw
 	if err := tx.QueryRowContext(ctx, query, args...).Scan(
@@ -271,7 +264,6 @@ func patchResource(ctx context.Context, tx *sql.Tx, patch *api.ResourcePatch) (*
 		&resourceRaw.Blob,
 		&resourceRaw.Type,
 		&resourceRaw.Size,
-		&resourceRaw.Visibility,
 		&resourceRaw.CreatorID,
 		&resourceRaw.CreatedTs,
 		&resourceRaw.UpdatedTs,
@@ -294,9 +286,6 @@ func findResourceList(ctx context.Context, tx *sql.Tx, find *api.ResourceFind) (
 	if v := find.Filename; v != nil {
 		where, args = append(where, "filename = ?"), append(args, *v)
 	}
-	if v := find.Visibility; v != nil {
-		where, args = append(where, "visibility = ?"), append(args, *v)
-	}
 	if v := find.MemoID; v != nil {
 		where, args = append(where, "id in (SELECT resource_id FROM memo_resource WHERE memo_id = ?)"), append(args, *v)
 	}
@@ -308,7 +297,6 @@ func findResourceList(ctx context.Context, tx *sql.Tx, find *api.ResourceFind) (
 			blob,
 			type,
 			size,
-			visibility,
 			creator_id,
 			created_ts,
 			updated_ts
@@ -331,7 +319,6 @@ func findResourceList(ctx context.Context, tx *sql.Tx, find *api.ResourceFind) (
 			&resourceRaw.Blob,
 			&resourceRaw.Type,
 			&resourceRaw.Size,
-			&resourceRaw.Visibility,
 			&resourceRaw.CreatorID,
 			&resourceRaw.CreatedTs,
 			&resourceRaw.UpdatedTs,