wip change area.media type to match the new common media type

src/db/MediaMetaType.ts

@@ -1,6 +1,6 @@
 export type ImageFormatType = 'jpeg' | 'png' | 'webp' | 'avif'
-export interface MediaMetaType {
-  name: string
+export interface MediaObjectType {
+  mediaUrl: string
   width: number
   height: number
   format: ImageFormatType

src/db/MediaObjectSchema.ts

@@ -1,11 +1,11 @@
 import mongoose from 'mongoose'
 
-import { MediaMetaType } from './MediaMetaType.js'
+import { MediaObjectType } from './MediaMetaType.js'
 
 const { Schema } = mongoose
 
-const schema = new Schema<MediaMetaType>({
-  name: { type: Schema.Types.String, unique: true },
+const schema = new Schema<MediaObjectType>({
+  mediaUrl: { type: Schema.Types.String, unique: true },
   width: { type: Schema.Types.Number, required: true },
   height: { type: Schema.Types.Number, required: true },
   size: { type: Schema.Types.Number, required: true },
@@ -14,6 +14,6 @@ const schema = new Schema<MediaMetaType>({
   mtime: { type: Schema.Types.Date, required: true }
 }, { _id: true, timestamps: true })
 
-export const getMediaObjectModel = (): mongoose.Model<MediaMetaType> => {
+export const getMediaObjectModel = (): mongoose.Model<MediaObjectType> => {
   return mongoose.model('media_objects', schema)
 }

src/db/MediaTypes.ts

@@ -3,7 +3,7 @@ import { MUUID } from 'uuid-mongodb'
 
 import { AreaType } from './AreaTypes.js'
 import { ClimbType } from './ClimbTypes.js'
-import { MediaMetaType } from './MediaMetaType.js'
+import { MediaObjectType } from './MediaMetaType.js'
 
 // Type for 'Media' collection schema
 // This is a misnomer.  Should have been called Tag.
@@ -26,7 +26,7 @@ export enum RefModelType {
 /**
  * A tag with media metadata
  */
-export type BaseTagType = MediaType & MediaMetaType
+export type BaseTagType = MediaType & MediaObjectType
 
 export interface CompleteAreaTag extends BaseTagType {
   area: AreaType
@@ -46,8 +46,9 @@ export interface MediaListByAuthorType {
 export interface SimpleTag {
   id: MUUID
   name: string
+  type: number
 }
-export interface UserMediaWithTags extends MediaMetaType {
+export interface UserMediaWithTags extends MediaObjectType {
   climbTags: SimpleTag[]
   areaTags: SimpleTag[]
 }

src/db/utils/jobs/CreateMediaMetaCollection.ts

@@ -2,7 +2,7 @@ import sharp from 'sharp'
 import { glob } from 'glob'
 import { connectDB, gracefulExit } from '../../index.js'
 import { logger } from '../../../logger.js'
-import { MediaMetaType } from '../../MediaMetaType.js'
+import { MediaObjectType } from '../../MediaMetaType.js'
 import { getMediaObjectModel } from '../../MediaObjectSchema.js'
 
 const onConnected = async (): Promise<void> => {
@@ -21,8 +21,8 @@ const onConnected = async (): Promise<void> => {
     if (width == null || height == null || image.size == null) continue
     if ((format !== 'avif' && format !== 'jpeg' && format !== 'png' && format !== 'webp')) continue
 
-    const meta: MediaMetaType = {
-      name: `/u/${image.parent?.name ?? ''}/${image.name}`,
+    const meta: MediaObjectType = {
+      mediaUrl: `/u/${image.parent?.name ?? ''}/${image.name}`,
       mtime: new Date(Math.round(image?.mtimeMs ?? 0)),
       birthTime: new Date(Math.round(image?.birthtimeMs ?? 0)),
       size: image.size,

src/graphql/media/MediaResolvers.ts

@@ -63,8 +63,12 @@ const MediaResolvers = {
     }
   },
 
+  MediaWithTags: {
+    username: async (node: BaseTagType) => await getUserNickFromMediaDir(node.mediaUrl.substring(3, 39))
+  },
+
   SimpleTag: {
-    id: async (node: SimpleTag) => node.id.toUUID().toString()
+    id: (node: SimpleTag) => node.id.toUUID().toString()
   },
 
   MediaListByAuthorType: {

src/graphql/media/queries.ts

@@ -24,7 +24,7 @@ const MediaQueries = {
    */
   getUserMedia: async (_, { userUuid, limit = 1000 }: { limit: number | undefined, userUuid: string }, { dataSources }): Promise<UserMediaWithTags[]> => {
     const { media }: DataSourcesType = dataSources
-    return await media.getUserPhotos(userUuid, limit)
+    return await media.getUserMedia(userUuid, limit)
   },
 
   getTagsLeaderboard: async (_, { limit = 30 }: { limit: number }, { dataSources }): Promise<TagsLeaderboardType[]> => {

src/graphql/resolvers.ts

@@ -21,6 +21,7 @@ import fs from 'fs'
 
 import { gql } from 'apollo-server'
 import { DocumentNode } from 'graphql'
+import MediaDataSource from '../model/MediaDataSource.js'
 
 /**
  * It takes a file name as an argument, reads the file, and returns a GraphQL DocumentNode.
@@ -164,9 +165,9 @@ const resolvers = {
 
     ancestors: (node: ClimbGQLQueryType) => node.ancestors.split(','),
 
-    media: async (node: any, args: any, { dataSources }) => {
-      const { areas }: { areas: AreaDataSource } = dataSources
-      return await areas.findMediaByClimbId(node._id)
+    media: async (node: ClimbType, args: any, { dataSources }) => {
+      const { media }: { media: MediaDataSource } = dataSources
+      return await media.findMediaByClimbId(node._id, node.name)
     },
 
     content: (node: ClimbGQLQueryType) => node.content == null

src/graphql/schema/Area.gql

@@ -65,7 +65,7 @@ type Area {
   "The total number of climbs in this area"
   totalClimbs: Int!
   "Media associated with this area, or its child climbs"
-  media: [BaseTag]
+  media: [MediaWithTags]
   createdAt: Date
   createdBy: ID
   updatedAt: Date

src/graphql/schema/Climb.gql

@@ -52,7 +52,7 @@ type Climb {
   ancestors: [String!]!
 
   "Media associated with this climb"
-  media: [BaseTag]
+  media: [MediaWithTags]
 
   yds: String @deprecated(reason: "Migrating to 'grades' field")
 

src/graphql/schema/Media.gql

@@ -15,7 +15,7 @@ type Query {
 }
 
 type Query {
-  getUserMedia(userUuid: ID!): [MediaWithTags]
+  getUserMedia(userUuid: ID!, limit: Int): [MediaWithTags]
 }
 
 type Query {
@@ -115,10 +115,12 @@ type MediaListByAuthorType {
 type SimpleTag {
   id: ID!
   name: String!
+  type: Int!
 }
 
 type MediaWithTags implements IMediaMetadata {
-  name: String!
+  username: String
+  mediaUrl: String!
   width: Int!
   height: Int!
   format: String!