@mediaryorg/contracts 2.0.1 → 2.1.0

package/dist/proto/paths.d.ts

@@ -3,7 +3,6 @@ export declare const PROTO_PATH: {
     readonly USER: string;
     readonly PROFILE: string;
     readonly MEDIA: string;
-    readonly COLLECTION: string;
     readonly LIBRARY: string;
     readonly FAVORITE: string;
     readonly MEDIA_REQUEST: string;

package/dist/proto/paths.js

@@ -8,7 +8,6 @@ exports.PROTO_PATH = {
     USER: (0, path_1.join)(PROTO_DIR, "user/v1/user.proto"),
     PROFILE: (0, path_1.join)(PROTO_DIR, "profile/v1/profile.proto"),
     MEDIA: (0, path_1.join)(PROTO_DIR, "media/v1/media.proto"),
-    COLLECTION: (0, path_1.join)(PROTO_DIR, "collection/v1/collection.proto"),
     LIBRARY: (0, path_1.join)(PROTO_DIR, "library/v1/library.proto"),
     FAVORITE: (0, path_1.join)(PROTO_DIR, "favorite/v1/favorite.proto"),
     MEDIA_REQUEST: (0, path_1.join)(PROTO_DIR, "media_request/v1/media_request.proto"),

package/generated/favorite/v1/favorite.ts

@@ -7,6 +7,7 @@
 /* eslint-disable */
 import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
 import { Observable } from "rxjs";
+import { MediaType } from "../../media/v1/media";
 
 export const protobufPackage = "favorite.v1";
 
@@ -53,7 +54,7 @@ export interface IsFavoriteResponse {
 export interface ListUserFavoritesRequest {
   userId: string;
   search?: string | undefined;
-  collectionId?: string | undefined;
+  type?: MediaType | undefined;
   page: number;
   limit: number;
   sortBy: string;

package/generated/library/v1/library.ts

@@ -7,7 +7,7 @@
 /* eslint-disable */
 import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
 import { Observable } from "rxjs";
-import { Media, MediaSource } from "../../media/v1/media";
+import { Media, MediaSource, MediaType } from "../../media/v1/media";
 
 export const protobufPackage = "library.v1";
 
@@ -69,7 +69,7 @@ export interface AddFromSearchResponse {
 export interface GetUserLibraryRequest {
   userId: string;
   statuses: LibraryItemStatus[];
-  collectionName?: string | undefined;
+  type?: MediaType | undefined;
   source?: MediaSource | undefined;
   search?: string | undefined;
   genres: string[];

package/generated/media/v1/media.ts

@@ -10,20 +10,47 @@ import { Observable } from "rxjs";
 
 export const protobufPackage = "media.v1";
 
-/** MediaSource mirrors prisma enum MediaSource. */
+/**
+ * Provider the canonical metadata came from. Mirrors search.v1.SearchSource
+ * (minus LOCAL, which is not a persisted origin). CUSTOM is reserved for
+ * manually added media (media-request flow) with no external provider.
+ */
 export enum MediaSource {
   MEDIA_SOURCE_UNSPECIFIED = 0,
   MEDIA_SOURCE_TMDB = 1,
   MEDIA_SOURCE_GOOGLE_BOOKS = 2,
   MEDIA_SOURCE_MAL = 3,
-  MEDIA_SOURCE_CUSTOM = 4,
+  MEDIA_SOURCE_ANILIST = 4,
+  MEDIA_SOURCE_MANGADEX = 5,
+  MEDIA_SOURCE_IGDB = 6,
+  MEDIA_SOURCE_RAWG = 7,
+  MEDIA_SOURCE_OPEN_LIBRARY = 8,
+  MEDIA_SOURCE_CUSTOM = 9,
   UNRECOGNIZED = -1,
 }
 
 /**
- * MediaData is the structured payload kept as JSON in the legacy database.
- * `custom_fields_json` contains the type-specific customFields object as a
- * JSON-encoded string so callers can extend without breaking the schema.
+ * Intrinsic kind of the media entry. Mirrors search.v1.SearchMediaType so a
+ * search hit maps 1:1 onto a catalog type. Replaces the legacy Collection
+ * concept (the 8 categories are now an attribute of the media itself).
+ */
+export enum MediaType {
+  MEDIA_TYPE_UNSPECIFIED = 0,
+  MEDIA_TYPE_MOVIE = 1,
+  MEDIA_TYPE_SERIES = 2,
+  MEDIA_TYPE_BOOK = 3,
+  MEDIA_TYPE_ANIME = 4,
+  MEDIA_TYPE_MANGA = 5,
+  MEDIA_TYPE_MANHWA = 6,
+  MEDIA_TYPE_GAME = 7,
+  MEDIA_TYPE_KDRAMA = 8,
+  UNRECOGNIZED = -1,
+}
+
+/**
+ * Structured metadata kept as a JSON column. `custom_fields_json` carries the
+ * type-specific customFields object as a JSON-encoded string so callers can
+ * extend it without schema migrations.
  */
 export interface MediaData {
   title: string;
@@ -41,33 +68,27 @@ export interface MediaData {
 
 export interface Media {
   id: string;
+  type: MediaType;
   source: MediaSource;
   externalId: string;
   mediaData: MediaData | undefined;
   searchableTitle: string;
+  /** JSON object preserving every known provider id, e.g. {"tmdb":"27205"}. */
   externalIdsJson: string;
-  collectionId: string;
+  /**
+   * Optional reference to the user who first added this entry (user-service).
+   * Purely informational; the catalog has no user ownership.
+   */
   addedById: string;
   createdAt: string;
   updatedAt: string;
 }
 
-export interface MediaCounts {
-  library: number;
-  reviews: number;
-  favorites: number;
-}
-
-export interface MediaWithCounts {
-  media: Media | undefined;
-  counts: MediaCounts | undefined;
-}
-
 export interface CreateMediaRequest {
+  type: MediaType;
   source: MediaSource;
   externalId: string;
   mediaData: MediaData | undefined;
-  collectionId: string;
   addedById: string;
 }
 
@@ -79,16 +100,8 @@ export interface GetMediaByIdRequest {
   mediaId: string;
 }
 
-export interface RatingDistributionEntry {
-  rating: number;
-  count: number;
-}
-
 export interface GetMediaByIdResponse {
   media: Media | undefined;
-  counts: MediaCounts | undefined;
-  averageRating: number;
-  totalReviews: number;
 }
 
 export interface GetMediaByExternalIdRequest {
@@ -109,27 +122,12 @@ export interface FindDuplicatesResponse {
   items: Media[];
 }
 
-export interface GetMediaStatsRequest {
-  mediaId: string;
-}
-
-export interface MediaStats {
-  averageRating: number;
-  totalReviews: number;
-  ratingDistribution: RatingDistributionEntry[];
-}
-
-export interface GetMediaStatsResponse {
-  media: Media | undefined;
-  stats: MediaStats | undefined;
-}
-
 export interface UpdateMediaRequest {
   mediaId: string;
+  type?: MediaType | undefined;
   source?: MediaSource | undefined;
   externalId?: string | undefined;
   mediaData?: MediaData | undefined;
-  collectionId?: string | undefined;
 }
 
 export interface UpdateMediaResponse {
@@ -145,7 +143,7 @@ export interface DeleteMediaResponse {
 
 export interface ListMediaRequest {
   search?: string | undefined;
-  collectionId?: string | undefined;
+  type?: MediaType | undefined;
   source?: MediaSource | undefined;
   year?: number | undefined;
   page: number;
@@ -164,19 +162,20 @@ export interface PaginationMeta {
 }
 
 export interface ListMediaResponse {
-  data: MediaWithCounts[];
+  data: Media[];
   meta: PaginationMeta | undefined;
 }
 
 export interface EnsureMediaFromSearchRequest {
   /**
    * Source identifier coming from search-service results
-   * ("tmdb", "google_books", "mangadex", ..., or "local" for already-existing)
+   * ("tmdb", "google_books", "anilist", "mangadex", ...). "local" means the
+   * hit already references a catalog entry by id.
    */
   source: string;
-  /** External id within that source (or media id when source == "local") */
+  /** External id within that source (or media id when source == "local"). */
   externalId: string;
-  /** Search media type label ("movie"|"series"|"book"|"anime"|"manga"|"manhwa"|"game"|"kdrama") */
+  /** Search media-type label ("movie"|"series"|"book"|"anime"|"manga"|"manhwa"|"game"|"kdrama"). */
   mediaType: string;
   title: string;
   subtitle: string;
@@ -184,7 +183,7 @@ export interface EnsureMediaFromSearchRequest {
   year: string;
   rating?: number | undefined;
   genres: string[];
-  /** User who initiated the action (becomes addedBy on creation). */
+  /** User who initiated the action (recorded as added_by_id on creation). */
   requestedByUserId: string;
 }
 
@@ -192,12 +191,20 @@ export interface EnsureMediaFromSearchResponse {
   media:
     | Media
     | undefined;
-  /** True when the media row was just created, false when reused. */
+  /** True when the catalog entry was just created, false when reused. */
   created: boolean;
 }
 
 export const MEDIA_V1_PACKAGE_NAME = "media.v1";
 
+/**
+ * MediaService owns the global media catalog ("storage"): a deduplicated,
+ * user-agnostic set of media entries that are reused across every user's
+ * lists/library. Adding media to a search/discover flow first checks this
+ * catalog before hitting external providers; removing media from a user's
+ * list never deletes it here.
+ */
+
 export interface MediaServiceClient {
   createMedia(request: CreateMediaRequest): Observable<CreateMediaResponse>;
 
@@ -207,8 +214,6 @@ export interface MediaServiceClient {
 
   findDuplicates(request: FindDuplicatesRequest): Observable<FindDuplicatesResponse>;
 
-  getMediaStats(request: GetMediaStatsRequest): Observable<GetMediaStatsResponse>;
-
   updateMedia(request: UpdateMediaRequest): Observable<UpdateMediaResponse>;
 
   deleteMedia(request: DeleteMediaRequest): Observable<DeleteMediaResponse>;
@@ -216,14 +221,22 @@ export interface MediaServiceClient {
   listMedia(request: ListMediaRequest): Observable<ListMediaResponse>;
 
   /**
-   * Cross-service: ensure media exists for a search hit.
-   * Used by library/favorites/recommendation flows so they don't need to write
-   * into the media database directly.
+   * Cross-service: ensure a catalog entry exists for a search/discover hit.
+   * Used by library/list/recommendation flows so they don't write into the
+   * catalog database directly. Returns the existing entry when found.
    */
 
   ensureMediaFromSearch(request: EnsureMediaFromSearchRequest): Observable<EnsureMediaFromSearchResponse>;
 }
 
+/**
+ * MediaService owns the global media catalog ("storage"): a deduplicated,
+ * user-agnostic set of media entries that are reused across every user's
+ * lists/library. Adding media to a search/discover flow first checks this
+ * catalog before hitting external providers; removing media from a user's
+ * list never deletes it here.
+ */
+
 export interface MediaServiceController {
   createMedia(
     request: CreateMediaRequest,
@@ -241,10 +254,6 @@ export interface MediaServiceController {
     request: FindDuplicatesRequest,
   ): Promise<FindDuplicatesResponse> | Observable<FindDuplicatesResponse> | FindDuplicatesResponse;
 
-  getMediaStats(
-    request: GetMediaStatsRequest,
-  ): Promise<GetMediaStatsResponse> | Observable<GetMediaStatsResponse> | GetMediaStatsResponse;
-
   updateMedia(
     request: UpdateMediaRequest,
   ): Promise<UpdateMediaResponse> | Observable<UpdateMediaResponse> | UpdateMediaResponse;
@@ -256,9 +265,9 @@ export interface MediaServiceController {
   listMedia(request: ListMediaRequest): Promise<ListMediaResponse> | Observable<ListMediaResponse> | ListMediaResponse;
 
   /**
-   * Cross-service: ensure media exists for a search hit.
-   * Used by library/favorites/recommendation flows so they don't need to write
-   * into the media database directly.
+   * Cross-service: ensure a catalog entry exists for a search/discover hit.
+   * Used by library/list/recommendation flows so they don't write into the
+   * catalog database directly. Returns the existing entry when found.
    */
 
   ensureMediaFromSearch(
@@ -273,7 +282,6 @@ export function MediaServiceControllerMethods() {
       "getMediaById",
       "getMediaByExternalId",
       "findDuplicates",
-      "getMediaStats",
       "updateMedia",
       "deleteMedia",
       "listMedia",

package/generated/media_request/v1/media_request.ts

@@ -7,7 +7,7 @@
 /* eslint-disable */
 import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
 import { Observable } from "rxjs";
-import { MediaData, MediaSource } from "../../media/v1/media";
+import { MediaData, MediaSource, MediaType } from "../../media/v1/media";
 
 export const protobufPackage = "media_request.v1";
 
@@ -45,7 +45,7 @@ export interface MediaRequest {
   moderatedById: string;
   moderatedBy: MediaRequestUserRef | undefined;
   approvedMediaId: string;
-  collectionId: string;
+  type: MediaType;
   createdAt: string;
   updatedAt: string;
 }
@@ -55,7 +55,7 @@ export interface CreateMediaRequestRequest {
   /** Currently only CUSTOM is accepted (TMDB content goes through search flow). */
   source?: MediaSource | undefined;
   mediaData: MediaData | undefined;
-  collectionId: string;
+  type: MediaType;
   comment?: string | undefined;
 }
 
@@ -83,7 +83,7 @@ export interface GetMediaRequestByIdResponse {
 export interface ListMediaRequestsRequest {
   status?: ModerationStatus | undefined;
   source?: MediaSource | undefined;
-  collectionId?: string | undefined;
+  type?: MediaType | undefined;
   search?: string | undefined;
   requestedById?: string | undefined;
   moderatedById?: string | undefined;

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@mediaryorg/contracts",
-    "version": "2.0.1",
+    "version": "2.1.0",
     "description": "Protobuf definitions and generated TypeScript types",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "scripts": {
         "generate": "npm run generate:win",
-        "generate:win": "protoc -I .\\proto .\\proto\\auth\\v1\\auth.proto .\\proto\\user\\v1\\user.proto .\\proto\\profile\\v1\\profile.proto .\\proto\\media\\v1\\media.proto .\\proto\\collection\\v1\\collection.proto .\\proto\\library\\v1\\library.proto .\\proto\\favorite\\v1\\favorite.proto .\\proto\\media_request\\v1\\media_request.proto .\\proto\\image\\v1\\image.proto .\\proto\\search\\v1\\search.proto .\\proto\\recommendation\\v1\\recommendation.proto --plugin=protoc-gen-ts_proto=.\\node_modules\\.bin\\protoc-gen-ts_proto.cmd --ts_proto_out=.\\generated --ts_proto_opt=nestJs=true,package=omit",
-        "generate:ci": "protoc -I ./proto ./proto/auth/v1/auth.proto ./proto/user/v1/user.proto ./proto/profile/v1/profile.proto ./proto/media/v1/media.proto ./proto/collection/v1/collection.proto ./proto/library/v1/library.proto ./proto/favorite/v1/favorite.proto ./proto/media_request/v1/media_request.proto ./proto/image/v1/image.proto ./proto/search/v1/search.proto ./proto/recommendation/v1/recommendation.proto --plugin=protoc-gen-ts_proto=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=./generated --ts_proto_opt=nestJs=true,package=omit",
+        "generate:win": "protoc -I .\\proto .\\proto\\auth\\v1\\auth.proto .\\proto\\user\\v1\\user.proto .\\proto\\profile\\v1\\profile.proto .\\proto\\media\\v1\\media.proto .\\proto\\library\\v1\\library.proto .\\proto\\favorite\\v1\\favorite.proto .\\proto\\media_request\\v1\\media_request.proto .\\proto\\image\\v1\\image.proto .\\proto\\search\\v1\\search.proto .\\proto\\recommendation\\v1\\recommendation.proto --plugin=protoc-gen-ts_proto=.\\node_modules\\.bin\\protoc-gen-ts_proto.cmd --ts_proto_out=.\\generated --ts_proto_opt=nestJs=true,package=omit",
+        "generate:ci": "protoc -I ./proto ./proto/auth/v1/auth.proto ./proto/user/v1/user.proto ./proto/profile/v1/profile.proto ./proto/media/v1/media.proto ./proto/library/v1/library.proto ./proto/favorite/v1/favorite.proto ./proto/media_request/v1/media_request.proto ./proto/image/v1/image.proto ./proto/search/v1/search.proto ./proto/recommendation/v1/recommendation.proto --plugin=protoc-gen-ts_proto=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=./generated --ts_proto_opt=nestJs=true,package=omit",
         "build": "tsc -p tsconfig.build.json"
     },
     "files": [

package/proto/favorite/v1/favorite.proto

@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package favorite.v1;
 
+import "media/v1/media.proto";
+
 service FavoriteService {
   rpc CheckMultipleFavorites(CheckMultipleFavoritesRequest) returns (CheckMultipleFavoritesResponse);
   rpc ToggleFavorite(ToggleFavoriteRequest) returns (ToggleFavoriteResponse);
@@ -48,7 +50,7 @@ message IsFavoriteResponse {
 message ListUserFavoritesRequest {
   string user_id = 1;
   optional string search = 2;
-  optional string collection_id = 3;
+  optional media.v1.MediaType type = 3;
   int32 page = 4;
   int32 limit = 5;
   string sort_by = 6;

package/proto/library/v1/library.proto

@@ -69,7 +69,7 @@ message AddFromSearchResponse {
 message GetUserLibraryRequest {
   string user_id = 1;
   repeated LibraryItemStatus statuses = 2;
-  optional string collection_name = 3;
+  optional media.v1.MediaType type = 3;
   optional media.v1.MediaSource source = 4;
   optional string search = 5;
   repeated string genres = 6;

package/proto/media/v1/media.proto

@@ -2,34 +2,60 @@ syntax = "proto3";
 
 package media.v1;
 
+// MediaService owns the global media catalog ("storage"): a deduplicated,
+// user-agnostic set of media entries that are reused across every user's
+// lists/library. Adding media to a search/discover flow first checks this
+// catalog before hitting external providers; removing media from a user's
+// list never deletes it here.
 service MediaService {
   rpc CreateMedia(CreateMediaRequest) returns (CreateMediaResponse);
   rpc GetMediaById(GetMediaByIdRequest) returns (GetMediaByIdResponse);
   rpc GetMediaByExternalId(GetMediaByExternalIdRequest) returns (GetMediaByExternalIdResponse);
   rpc FindDuplicates(FindDuplicatesRequest) returns (FindDuplicatesResponse);
-  rpc GetMediaStats(GetMediaStatsRequest) returns (GetMediaStatsResponse);
   rpc UpdateMedia(UpdateMediaRequest) returns (UpdateMediaResponse);
   rpc DeleteMedia(DeleteMediaRequest) returns (DeleteMediaResponse);
   rpc ListMedia(ListMediaRequest) returns (ListMediaResponse);
 
-  // Cross-service: ensure media exists for a search hit.
-  // Used by library/favorites/recommendation flows so they don't need to write
-  // into the media database directly.
+  // Cross-service: ensure a catalog entry exists for a search/discover hit.
+  // Used by library/list/recommendation flows so they don't write into the
+  // catalog database directly. Returns the existing entry when found.
   rpc EnsureMediaFromSearch(EnsureMediaFromSearchRequest) returns (EnsureMediaFromSearchResponse);
 }
 
-// MediaSource mirrors prisma enum MediaSource.
+// Provider the canonical metadata came from. Mirrors search.v1.SearchSource
+// (minus LOCAL, which is not a persisted origin). CUSTOM is reserved for
+// manually added media (media-request flow) with no external provider.
 enum MediaSource {
   MEDIA_SOURCE_UNSPECIFIED = 0;
   MEDIA_SOURCE_TMDB = 1;
   MEDIA_SOURCE_GOOGLE_BOOKS = 2;
   MEDIA_SOURCE_MAL = 3;
-  MEDIA_SOURCE_CUSTOM = 4;
-}
-
-// MediaData is the structured payload kept as JSON in the legacy database.
-// `custom_fields_json` contains the type-specific customFields object as a
-// JSON-encoded string so callers can extend without breaking the schema.
+  MEDIA_SOURCE_ANILIST = 4;
+  MEDIA_SOURCE_MANGADEX = 5;
+  MEDIA_SOURCE_IGDB = 6;
+  MEDIA_SOURCE_RAWG = 7;
+  MEDIA_SOURCE_OPEN_LIBRARY = 8;
+  MEDIA_SOURCE_CUSTOM = 9;
+}
+
+// Intrinsic kind of the media entry. Mirrors search.v1.SearchMediaType so a
+// search hit maps 1:1 onto a catalog type. Replaces the legacy Collection
+// concept (the 8 categories are now an attribute of the media itself).
+enum MediaType {
+  MEDIA_TYPE_UNSPECIFIED = 0;
+  MEDIA_TYPE_MOVIE = 1;
+  MEDIA_TYPE_SERIES = 2;
+  MEDIA_TYPE_BOOK = 3;
+  MEDIA_TYPE_ANIME = 4;
+  MEDIA_TYPE_MANGA = 5;
+  MEDIA_TYPE_MANHWA = 6;
+  MEDIA_TYPE_GAME = 7;
+  MEDIA_TYPE_KDRAMA = 8;
+}
+
+// Structured metadata kept as a JSON column. `custom_fields_json` carries the
+// type-specific customFields object as a JSON-encoded string so callers can
+// extend it without schema migrations.
 message MediaData {
   string title = 1;
   string original_title = 2;
@@ -46,33 +72,25 @@ message MediaData {
 
 message Media {
   string id = 1;
-  MediaSource source = 2;
-  string external_id = 3;
-  MediaData media_data = 4;
-  string searchable_title = 5;
-  string external_ids_json = 6;
-  string collection_id = 7;
+  MediaType type = 2;
+  MediaSource source = 3;
+  string external_id = 4;
+  MediaData media_data = 5;
+  string searchable_title = 6;
+  // JSON object preserving every known provider id, e.g. {"tmdb":"27205"}.
+  string external_ids_json = 7;
+  // Optional reference to the user who first added this entry (user-service).
+  // Purely informational; the catalog has no user ownership.
   string added_by_id = 8;
   string created_at = 9;
   string updated_at = 10;
 }
 
-message MediaCounts {
-  int32 library = 1;
-  int32 reviews = 2;
-  int32 favorites = 3;
-}
-
-message MediaWithCounts {
-  Media media = 1;
-  MediaCounts counts = 2;
-}
-
 message CreateMediaRequest {
-  MediaSource source = 1;
-  string external_id = 2;
-  MediaData media_data = 3;
-  string collection_id = 4;
+  MediaType type = 1;
+  MediaSource source = 2;
+  string external_id = 3;
+  MediaData media_data = 4;
   string added_by_id = 5;
 }
 
@@ -84,16 +102,8 @@ message GetMediaByIdRequest {
   string media_id = 1;
 }
 
-message RatingDistributionEntry {
-  double rating = 1;
-  int32 count = 2;
-}
-
 message GetMediaByIdResponse {
   Media media = 1;
-  MediaCounts counts = 2;
-  double average_rating = 3;
-  int32 total_reviews = 4;
 }
 
 message GetMediaByExternalIdRequest {
@@ -114,27 +124,12 @@ message FindDuplicatesResponse {
   repeated Media items = 1;
 }
 
-message GetMediaStatsRequest {
-  string media_id = 1;
-}
-
-message MediaStats {
-  double average_rating = 1;
-  int32 total_reviews = 2;
-  repeated RatingDistributionEntry rating_distribution = 3;
-}
-
-message GetMediaStatsResponse {
-  Media media = 1;
-  MediaStats stats = 2;
-}
-
 message UpdateMediaRequest {
   string media_id = 1;
-  optional MediaSource source = 2;
-  optional string external_id = 3;
-  optional MediaData media_data = 4;
-  optional string collection_id = 5;
+  optional MediaType type = 2;
+  optional MediaSource source = 3;
+  optional string external_id = 4;
+  optional MediaData media_data = 5;
 }
 
 message UpdateMediaResponse {
@@ -149,7 +144,7 @@ message DeleteMediaResponse {}
 
 message ListMediaRequest {
   optional string search = 1;
-  optional string collection_id = 2;
+  optional MediaType type = 2;
   optional MediaSource source = 3;
   optional int32 year = 4;
   int32 page = 5;
@@ -168,17 +163,18 @@ message PaginationMeta {
 }
 
 message ListMediaResponse {
-  repeated MediaWithCounts data = 1;
+  repeated Media data = 1;
   PaginationMeta meta = 2;
 }
 
 message EnsureMediaFromSearchRequest {
   // Source identifier coming from search-service results
-  // ("tmdb", "google_books", "mangadex", ..., or "local" for already-existing)
+  // ("tmdb", "google_books", "anilist", "mangadex", ...). "local" means the
+  // hit already references a catalog entry by id.
   string source = 1;
-  // External id within that source (or media id when source == "local")
+  // External id within that source (or media id when source == "local").
   string external_id = 2;
-  // Search media type label ("movie"|"series"|"book"|"anime"|"manga"|"manhwa"|"game"|"kdrama")
+  // Search media-type label ("movie"|"series"|"book"|"anime"|"manga"|"manhwa"|"game"|"kdrama").
   string media_type = 3;
   string title = 4;
   string subtitle = 5;
@@ -186,12 +182,12 @@ message EnsureMediaFromSearchRequest {
   string year = 7;
   optional double rating = 8;
   repeated string genres = 9;
-  // User who initiated the action (becomes addedBy on creation).
+  // User who initiated the action (recorded as added_by_id on creation).
   string requested_by_user_id = 10;
 }
 
 message EnsureMediaFromSearchResponse {
   Media media = 1;
-  // True when the media row was just created, false when reused.
+  // True when the catalog entry was just created, false when reused.
   bool created = 2;
 }

package/proto/media_request/v1/media_request.proto

@@ -48,7 +48,7 @@ message MediaRequest {
   string moderated_by_id = 12;
   MediaRequestUserRef moderated_by = 13;
   string approved_media_id = 14;
-  string collection_id = 15;
+  media.v1.MediaType type = 15;
   string created_at = 16;
   string updated_at = 17;
 }
@@ -58,7 +58,7 @@ message CreateMediaRequestRequest {
   // Currently only CUSTOM is accepted (TMDB content goes through search flow).
   optional media.v1.MediaSource source = 2;
   media.v1.MediaData media_data = 3;
-  string collection_id = 4;
+  media.v1.MediaType type = 4;
   optional string comment = 5;
 }
 
@@ -86,7 +86,7 @@ message GetMediaRequestByIdResponse {
 message ListMediaRequestsRequest {
   optional ModerationStatus status = 1;
   optional media.v1.MediaSource source = 2;
-  optional string collection_id = 3;
+  optional media.v1.MediaType type = 3;
   optional string search = 4;
   optional string requested_by_id = 5;
   optional string moderated_by_id = 6;

package/generated/collection/v1/collection.ts

@@ -1,235 +0,0 @@
-// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
-// versions:
-//   protoc-gen-ts_proto  v2.11.6
-//   protoc               v3.21.12
-// source: collection/v1/collection.proto
-
-/* eslint-disable */
-import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
-import { Observable } from "rxjs";
-
-export const protobufPackage = "collection.v1";
-
-export interface Collection {
-  id: string;
-  name: string;
-  createdAt: string;
-  updatedAt: string;
-  /** Number of Media records linked to the collection (returned by list/get). */
-  mediaCount: number;
-}
-
-export interface CollectionWithUserStatus {
-  collection: Collection | undefined;
-  isAdded: boolean;
-}
-
-export interface UserCollection {
-  id: string;
-  userId: string;
-  collectionId: string;
-  collection: Collection | undefined;
-  createdAt: string;
-  updatedAt: string;
-}
-
-export interface ListCollectionsRequest {
-}
-
-export interface ListCollectionsResponse {
-  items: Collection[];
-}
-
-export interface GetCollectionByIdRequest {
-  collectionId: string;
-}
-
-export interface GetCollectionByIdResponse {
-  collection: Collection | undefined;
-}
-
-export interface GetCollectionByNameRequest {
-  name: string;
-}
-
-export interface GetCollectionByNameResponse {
-  collection: Collection | undefined;
-}
-
-export interface SeedInitialCollectionsRequest {
-}
-
-export interface SeedInitialCollectionsResponse {
-  items: Collection[];
-}
-
-export interface GetUserCollectionsRequest {
-  userId: string;
-}
-
-export interface GetUserCollectionsResponse {
-  items: Collection[];
-}
-
-export interface GetAllCollectionsWithUserStatusRequest {
-  userId: string;
-}
-
-export interface GetAllCollectionsWithUserStatusResponse {
-  items: CollectionWithUserStatus[];
-}
-
-export interface GetAvailableCollectionsRequest {
-  userId: string;
-}
-
-export interface GetAvailableCollectionsResponse {
-  items: Collection[];
-}
-
-export interface AddCollectionToUserRequest {
-  userId: string;
-  collectionId: string;
-}
-
-export interface AddCollectionToUserResponse {
-  userCollection: UserCollection | undefined;
-}
-
-export interface RemoveCollectionFromUserRequest {
-  userId: string;
-  collectionId: string;
-}
-
-export interface RemoveCollectionFromUserResponse {
-  collectionId: string;
-}
-
-export interface InitializeDefaultCollectionsRequest {
-  userId: string;
-}
-
-export interface InitializeDefaultCollectionsResponse {
-  items: UserCollection[];
-}
-
-export const COLLECTION_V1_PACKAGE_NAME = "collection.v1";
-
-export interface CollectionServiceClient {
-  /** Global catalog of media collections (Movies, Series, Books, Manga, Manhwa, Anime, Games, KDramas). */
-
-  listCollections(request: ListCollectionsRequest): Observable<ListCollectionsResponse>;
-
-  getCollectionById(request: GetCollectionByIdRequest): Observable<GetCollectionByIdResponse>;
-
-  getCollectionByName(request: GetCollectionByNameRequest): Observable<GetCollectionByNameResponse>;
-
-  seedInitialCollections(request: SeedInitialCollectionsRequest): Observable<SeedInitialCollectionsResponse>;
-
-  /** Per-user enabled collections. */
-
-  getUserCollections(request: GetUserCollectionsRequest): Observable<GetUserCollectionsResponse>;
-
-  getAllCollectionsWithUserStatus(
-    request: GetAllCollectionsWithUserStatusRequest,
-  ): Observable<GetAllCollectionsWithUserStatusResponse>;
-
-  getAvailableCollections(request: GetAvailableCollectionsRequest): Observable<GetAvailableCollectionsResponse>;
-
-  addCollectionToUser(request: AddCollectionToUserRequest): Observable<AddCollectionToUserResponse>;
-
-  removeCollectionFromUser(request: RemoveCollectionFromUserRequest): Observable<RemoveCollectionFromUserResponse>;
-
-  initializeDefaultCollections(
-    request: InitializeDefaultCollectionsRequest,
-  ): Observable<InitializeDefaultCollectionsResponse>;
-}
-
-export interface CollectionServiceController {
-  /** Global catalog of media collections (Movies, Series, Books, Manga, Manhwa, Anime, Games, KDramas). */
-
-  listCollections(
-    request: ListCollectionsRequest,
-  ): Promise<ListCollectionsResponse> | Observable<ListCollectionsResponse> | ListCollectionsResponse;
-
-  getCollectionById(
-    request: GetCollectionByIdRequest,
-  ): Promise<GetCollectionByIdResponse> | Observable<GetCollectionByIdResponse> | GetCollectionByIdResponse;
-
-  getCollectionByName(
-    request: GetCollectionByNameRequest,
-  ): Promise<GetCollectionByNameResponse> | Observable<GetCollectionByNameResponse> | GetCollectionByNameResponse;
-
-  seedInitialCollections(
-    request: SeedInitialCollectionsRequest,
-  ):
-    | Promise<SeedInitialCollectionsResponse>
-    | Observable<SeedInitialCollectionsResponse>
-    | SeedInitialCollectionsResponse;
-
-  /** Per-user enabled collections. */
-
-  getUserCollections(
-    request: GetUserCollectionsRequest,
-  ): Promise<GetUserCollectionsResponse> | Observable<GetUserCollectionsResponse> | GetUserCollectionsResponse;
-
-  getAllCollectionsWithUserStatus(
-    request: GetAllCollectionsWithUserStatusRequest,
-  ):
-    | Promise<GetAllCollectionsWithUserStatusResponse>
-    | Observable<GetAllCollectionsWithUserStatusResponse>
-    | GetAllCollectionsWithUserStatusResponse;
-
-  getAvailableCollections(
-    request: GetAvailableCollectionsRequest,
-  ):
-    | Promise<GetAvailableCollectionsResponse>
-    | Observable<GetAvailableCollectionsResponse>
-    | GetAvailableCollectionsResponse;
-
-  addCollectionToUser(
-    request: AddCollectionToUserRequest,
-  ): Promise<AddCollectionToUserResponse> | Observable<AddCollectionToUserResponse> | AddCollectionToUserResponse;
-
-  removeCollectionFromUser(
-    request: RemoveCollectionFromUserRequest,
-  ):
-    | Promise<RemoveCollectionFromUserResponse>
-    | Observable<RemoveCollectionFromUserResponse>
-    | RemoveCollectionFromUserResponse;
-
-  initializeDefaultCollections(
-    request: InitializeDefaultCollectionsRequest,
-  ):
-    | Promise<InitializeDefaultCollectionsResponse>
-    | Observable<InitializeDefaultCollectionsResponse>
-    | InitializeDefaultCollectionsResponse;
-}
-
-export function CollectionServiceControllerMethods() {
-  return function (constructor: Function) {
-    const grpcMethods: string[] = [
-      "listCollections",
-      "getCollectionById",
-      "getCollectionByName",
-      "seedInitialCollections",
-      "getUserCollections",
-      "getAllCollectionsWithUserStatus",
-      "getAvailableCollections",
-      "addCollectionToUser",
-      "removeCollectionFromUser",
-      "initializeDefaultCollections",
-    ];
-    for (const method of grpcMethods) {
-      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
-      GrpcMethod("CollectionService", method)(constructor.prototype[method], method, descriptor);
-    }
-    const grpcStreamMethods: string[] = [];
-    for (const method of grpcStreamMethods) {
-      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
-      GrpcStreamMethod("CollectionService", method)(constructor.prototype[method], method, descriptor);
-    }
-  };
-}
-
-export const COLLECTION_SERVICE_NAME = "CollectionService";

package/proto/collection/v1/collection.proto

@@ -1,120 +0,0 @@
-syntax = "proto3";
-
-package collection.v1;
-
-service CollectionService {
-  // Global catalog of media collections (Movies, Series, Books, Manga, Manhwa, Anime, Games, KDramas).
-  rpc ListCollections(ListCollectionsRequest) returns (ListCollectionsResponse);
-  rpc GetCollectionById(GetCollectionByIdRequest) returns (GetCollectionByIdResponse);
-  rpc GetCollectionByName(GetCollectionByNameRequest) returns (GetCollectionByNameResponse);
-  rpc SeedInitialCollections(SeedInitialCollectionsRequest) returns (SeedInitialCollectionsResponse);
-
-  // Per-user enabled collections.
-  rpc GetUserCollections(GetUserCollectionsRequest) returns (GetUserCollectionsResponse);
-  rpc GetAllCollectionsWithUserStatus(GetAllCollectionsWithUserStatusRequest) returns (GetAllCollectionsWithUserStatusResponse);
-  rpc GetAvailableCollections(GetAvailableCollectionsRequest) returns (GetAvailableCollectionsResponse);
-  rpc AddCollectionToUser(AddCollectionToUserRequest) returns (AddCollectionToUserResponse);
-  rpc RemoveCollectionFromUser(RemoveCollectionFromUserRequest) returns (RemoveCollectionFromUserResponse);
-  rpc InitializeDefaultCollections(InitializeDefaultCollectionsRequest) returns (InitializeDefaultCollectionsResponse);
-}
-
-message Collection {
-  string id = 1;
-  string name = 2;
-  string created_at = 3;
-  string updated_at = 4;
-  // Number of Media records linked to the collection (returned by list/get).
-  int32 media_count = 5;
-}
-
-message CollectionWithUserStatus {
-  Collection collection = 1;
-  bool is_added = 2;
-}
-
-message UserCollection {
-  string id = 1;
-  string user_id = 2;
-  string collection_id = 3;
-  Collection collection = 4;
-  string created_at = 5;
-  string updated_at = 6;
-}
-
-message ListCollectionsRequest {}
-
-message ListCollectionsResponse {
-  repeated Collection items = 1;
-}
-
-message GetCollectionByIdRequest {
-  string collection_id = 1;
-}
-
-message GetCollectionByIdResponse {
-  Collection collection = 1;
-}
-
-message GetCollectionByNameRequest {
-  string name = 1;
-}
-
-message GetCollectionByNameResponse {
-  Collection collection = 1;
-}
-
-message SeedInitialCollectionsRequest {}
-
-message SeedInitialCollectionsResponse {
-  repeated Collection items = 1;
-}
-
-message GetUserCollectionsRequest {
-  string user_id = 1;
-}
-
-message GetUserCollectionsResponse {
-  repeated Collection items = 1;
-}
-
-message GetAllCollectionsWithUserStatusRequest {
-  string user_id = 1;
-}
-
-message GetAllCollectionsWithUserStatusResponse {
-  repeated CollectionWithUserStatus items = 1;
-}
-
-message GetAvailableCollectionsRequest {
-  string user_id = 1;
-}
-
-message GetAvailableCollectionsResponse {
-  repeated Collection items = 1;
-}
-
-message AddCollectionToUserRequest {
-  string user_id = 1;
-  string collection_id = 2;
-}
-
-message AddCollectionToUserResponse {
-  UserCollection user_collection = 1;
-}
-
-message RemoveCollectionFromUserRequest {
-  string user_id = 1;
-  string collection_id = 2;
-}
-
-message RemoveCollectionFromUserResponse {
-  string collection_id = 1;
-}
-
-message InitializeDefaultCollectionsRequest {
-  string user_id = 1;
-}
-
-message InitializeDefaultCollectionsResponse {
-  repeated UserCollection items = 1;
-}