ldco-contract 0.1.14 → 0.1.16

package/dist/types/entities/user_friend.entity.d.ts

@@ -0,0 +1,6 @@
+export interface UserFriendEntity {
+    _id: string;
+    userId: string;
+    friendId: string;
+    createdAt: Date;
+}

package/dist/types/entities/user_marked_dance.entity.d.ts

@@ -0,0 +1,6 @@
+export interface UserMarkedDanceEntity {
+    _id: string;
+    userId: string;
+    danceId: string;
+    createdAt: Date;
+}

package/dist/types/entities/venue.entity.d.ts

@@ -0,0 +1,14 @@
+export interface VenueEntity {
+    _id: string;
+    venuename: string;
+    venueaddress: string;
+    geolocation: [number, number];
+    phone: string;
+    website: string;
+    contactEmail: string;
+    contactName: string;
+    contactPhone: string;
+    isDeleted?: boolean;
+    deletedAt?: Date;
+    createdAt?: Date;
+}

package/dist/types/model/collection.model.d.ts

@@ -1,5 +1,6 @@
 import { DanceModel } from "./dance.model";
 export interface CollectionModel {
+    id: string;
     name: string;
     dances: DanceModel[];
     createdAt: Date;

package/dist/types/model/dance.model.d.ts

@@ -1,6 +1,7 @@
 import { ChoreographerModel } from './choreographer.model';
 import { TrackModel } from './track.model';
 export interface DanceModel {
+    id: string;
     danceName: string;
     choreographers: ChoreographerModel[];
     stepsheet: string;

package/dist/types/model/lesson.model.d.ts

@@ -1,5 +1,6 @@
 import { InstructorModel } from "./instructor.model";
 export interface LessonModel {
+    id: string;
     lessonday: string;
     lessonstart: string;
     instructors: InstructorModel[];

package/dist/types/requests/userInfoUpdate.request.d.ts

@@ -1,6 +1,5 @@
 import { SocialMediaLinks } from "../model/userTypes/socialMediaLinks";
 export interface UserInfoUpdateRequest {
-    userId: string;
     name?: string;
     username?: string;
     profilePictureUrl?: string;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.14",
+  "version": "0.1.16",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/index.ts

@@ -1,3 +1,22 @@
+// ENTITIES
+export { AppealChoreographerUser } from './types/entities/appeal_choreographer_user.entity';
+export { AppealInstructorUser } from './types/entities/appeal_instructor_user.entity';
+export { CancelledLessonEntity } from './types/entities/cancelled_lesson.entity';
+export { ChoreographerEntity } from './types/entities/choreographer.entity';
+export { DanceCollectionEntity } from './types/entities/dance_collection.entity';
+export { DanceEntity } from './types/entities/dance.entity';
+export { FriendRequestEntity } from './types/entities/friend_request.entity';
+export { InstructorEntity } from './types/entities/instructor.entity';
+export { LessonEntity } from './types/entities/lesson.entity';
+export { TrackEntity } from './types/entities/track.entity';
+export { UserCollectionEntity } from './types/entities/user_collection.entity'; //TODO: What's the difference between a DanceCollection and a UserCollection?
+export { UserFavoriteVenueEntity } from './types/entities/user_favorite_venue.entity';
+export { UserFollowEntity } from './types/entities/user_follow.entity';
+export { UserFriendEntity } from './types/entities/user_friend.entity';
+export { UserMarkedDanceEntity } from './types/entities/user_marked_dance.entity';
+export { UserEntity } from './types/entities/user.entity';
+export { VenueEntity } from './types/entities/venue.entity';
+
 // DTOS
 export { ChoreographerDTO } from './types/dto/choreographer.dto';
 export { CollectionDTO } from './types/dto/collection.dto';
@@ -31,4 +50,23 @@ export { UserDances } from './types/model/userTypes/userDances';
 export { getAllUserDanceIds } from './lib/getAllUserDanceIds';
 
 // REQUESTS
-export { UserInfoUpdateRequest } from './types/requests/userInfoUpdate.request';
+export { UserInfoUpdateRequest } from './types/requests/userInfoUpdate.request';
+
+// CONVERTERS
+export { toChoreographerDTO } from './lib/converters/toChoreographerDTO';
+export { toChoreographerModel } from './lib/converters/toChoreographerModel';
+export { toCollectionModel } from './lib/converters/toCollectionsModel';
+export { toDanceDTO } from './lib/converters/toDanceDTO';
+export { toDanceModel } from './lib/converters/toDanceModel';
+export { toInstructorDTO } from './lib/converters/toInstructorDTO';
+export { toInstructorModel } from './lib/converters/toInstructorModel';
+export { toLessonDTO } from './lib/converters/toLessonDTO';
+export { toLessonModel } from './lib/converters/toLessonModel';
+export { toTrackDTO } from './lib/converters/toTrackDTO';
+export { toTrackModel } from './lib/converters/toTrackModel';
+export { toUserAcquaintanceDTO } from './lib/converters/toUserAcquaintanceDTO';
+export { toUserAcquaintanceModel } from './lib/converters/toUserAcquaintanceModel';
+export { toUserDTO } from './lib/converters/toUserDTO';
+export { toUserModel } from './lib/converters/toUserModel';
+export { toVenueDTO } from './lib/converters/toVenueDTO';
+export { toVenueModel } from './lib/converters/toVenueModel';

package/src/lib/converters/toChoreographerDTO.ts

@@ -0,0 +1,14 @@
+import { ChoreographerDTO } from '../../types/dto/choreographer.dto';
+import { ChoreographerEntity } from '../../types/entities/choreographer.entity';
+
+export function toChoreographerDTO(
+    choreographer: ChoreographerEntity,
+    isVerified: boolean
+): ChoreographerDTO {
+
+  return {
+    id: choreographer._id,
+    name: choreographer.name,
+    isVerified: isVerified
+  };
+}

package/src/lib/converters/toChoreographerModel.ts

@@ -0,0 +1,13 @@
+import { ChoreographerDTO } from "../../types/dto/choreographer.dto";
+import { ChoreographerModel } from "../../types/model/choreographer.model";
+
+export function toChoreographerModel(
+    dto: ChoreographerDTO
+): ChoreographerModel {
+
+  return {
+    id: dto.id,
+    name: dto.name,
+    isVerified: dto.isVerified
+  };
+}

package/src/lib/converters/toCollectionsModel.ts

@@ -0,0 +1,26 @@
+import { ChoreographerDTO } from '../../types/dto/choreographer.dto';
+import { CollectionDTO } from '../../types/dto/collection.dto';
+import { DanceDTO } from '../../types/dto/dance.dto';
+import { TrackDTO } from '../../types/dto/track.dto';
+import { CollectionModel } from '../../types/model/collection.model';
+import { toDanceModel } from './toDanceModel';
+
+export function toCollectionModel(
+    dto: CollectionDTO,
+    danceMap: Record<string, DanceDTO>,
+    trackMap: Record<string, TrackDTO>,
+    choreographerMap: Record<string, ChoreographerDTO>
+): CollectionModel {
+    const dances = dto.dances.map(id => danceMap[id]).filter(Boolean);
+
+    return {
+        id: dto._id,
+        name: dto.name,
+        dances: dances.map(d => toDanceModel(d, trackMap, choreographerMap)),
+        isVerified: dto.isVerified,
+        createdAt: dto.createdAt,
+        updatedAt: dto.updatedAt,
+        createdBy: dto.createdBy,
+        isCopyable: dto.isCopyable,
+    };
+}

package/src/lib/converters/toDanceDTO.ts

@@ -0,0 +1,19 @@
+import { DanceDTO } from "../../types/dto/dance.dto";
+import { DanceEntity } from "../../types/entities/dance.entity";
+
+export function toDanceDTO(
+  dance: DanceEntity,
+  isVerified: boolean
+): DanceDTO {
+
+  return {
+    id: dance._id,
+    danceName: dance.danceName,
+    choreographers: dance.choreographers?.map((id: string) => id) ?? [],
+    stepsheet: dance.stepsheet,
+    difficulty: dance.difficulty,
+    primaryTrack: dance.primaryTrack ?? '',
+    tracks: dance.tracks?.map((id: string) => id) ?? [],
+    isVerified: isVerified
+  };
+};

package/src/lib/converters/toDanceModel.ts

@@ -0,0 +1,28 @@
+import { ChoreographerDTO } from '../../types/dto/choreographer.dto';
+import { DanceDTO } from '../../types/dto/dance.dto';
+import { TrackDTO } from '../../types/dto/track.dto';
+import { DanceModel } from '../../types/model/dance.model';
+import { toChoreographerModel } from './toChoreographerModel';
+import { toTrackModel } from './toTrackModel';
+
+export function toDanceModel(
+  dto: DanceDTO,
+  trackMap: Record<string, TrackDTO>,
+  choreographerMap: Record<string, ChoreographerDTO>
+): DanceModel {
+
+  const tracks = dto.tracks
+    .map(id => trackMap[id])
+    .filter(Boolean);
+
+  return {
+    id: dto.id,
+    danceName: dto.danceName,
+    choreographers: dto.choreographers.map(id => toChoreographerModel(choreographerMap[id])),
+    stepsheet: dto.stepsheet,
+    difficulty: dto.difficulty,
+    primaryTrack: toTrackModel(trackMap[dto.primaryTrack]),
+    tracks: tracks.map(toTrackModel),
+    isVerified: dto.isVerified,
+  };
+}

package/src/lib/converters/toInstructorDTO.ts

@@ -0,0 +1,15 @@
+import { InstructorDTO } from "../../types/dto/instructor.dto";
+import { InstructorEntity } from "../../types/entities/instructor.entity";
+
+export function toInstructorDTO(
+    instructor: InstructorEntity,
+    isVerified: boolean
+): InstructorDTO {
+
+  return {
+    id: instructor._id,
+    name: instructor.name,
+    userid: "leave this this empty for now and figure it out later...",
+    isVerified: isVerified
+  };
+}

package/src/lib/converters/toInstructorModel.ts

@@ -0,0 +1,14 @@
+import { InstructorDTO } from "../../types/dto/instructor.dto";
+import { InstructorModel } from "../../types/model/instructor.model";
+
+export function toInstructorModel(
+    dto: InstructorDTO,  
+): InstructorModel {
+
+  return {
+    id: dto.id,
+    name: dto.name,
+    userid: "leave this this empty for now and figure it out later...",
+    isVerified: dto.isVerified
+  };
+}

package/src/lib/converters/toLessonDTO.ts

@@ -0,0 +1,20 @@
+import { LessonDTO } from "../../types/dto/lesson.dto";
+import { LessonEntity } from "../../types/entities/lesson.entity";
+
+export function toLessonDTO(
+  LessonEntity: LessonEntity,
+  isVerified: boolean
+): LessonDTO {
+
+  return {
+    id: LessonEntity._id,
+    lessonday: LessonEntity.lessonday,
+    lessonstart: LessonEntity.lessonstart,
+    instructors: LessonEntity.instructors,
+    duration: LessonEntity.duration,
+    lessoncost: LessonEntity.lessoncost,
+    notes: LessonEntity.notes,
+    difficulty: LessonEntity.difficulty,
+    isVerified: isVerified
+  };
+}

package/src/lib/converters/toLessonModel.ts

@@ -0,0 +1,20 @@
+import { InstructorDTO } from "../../types/dto/instructor.dto";
+import { LessonDTO } from "../../types/dto/lesson.dto";
+import { LessonModel } from "../../types/model/lesson.model";
+
+export function toLessonModel(
+  lessonDTO: LessonDTO,
+  instructorMap: Record<string, InstructorDTO>
+): LessonModel {
+
+  return {
+    id: lessonDTO.id,
+    lessonday: lessonDTO.lessonday,
+    lessonstart: lessonDTO.lessonstart,
+    instructors: lessonDTO.instructors.map(id => instructorMap[id]).filter(Boolean), // TODO: Do I need the converter?
+    duration: lessonDTO.duration,
+    lessoncost: lessonDTO.lessoncost,
+    notes: lessonDTO.notes,
+    difficulty: lessonDTO.difficulty,
+  };
+}

package/src/lib/converters/toTrackDTO.ts

@@ -0,0 +1,15 @@
+import { TrackDTO } from "../../types/dto/track.dto";
+import { TrackEntity } from "../../types/entities/track.entity";
+
+export function toTrackDTO(dto: TrackEntity, isVerified: boolean): TrackDTO {
+  return {
+    id: dto._id,
+    name: dto.name,
+    artists: dto.artists,
+    isrc: dto.isrc,
+    uri: dto.uri,
+    duration_ms: dto.duration_ms,
+    explicit: dto.explicit,
+    isVerified: isVerified,
+  };
+}

package/src/lib/converters/toTrackModel.ts

@@ -0,0 +1,15 @@
+import { TrackDTO } from "../../types/dto/track.dto";
+import { TrackModel } from "../../types/model/track.model";
+
+export function toTrackModel(dto: TrackDTO): TrackModel {
+  return {
+    id: dto.id,
+    name: dto.name,
+    artists: dto.artists,
+    isrc: dto.isrc,
+    uri: dto.uri,
+    duration_ms: dto.duration_ms,
+    explicit: dto.explicit,
+    isVerified: dto.isVerified,
+  };
+}

package/src/lib/converters/toUserAcquaintanceDTO.ts

@@ -0,0 +1,42 @@
+import { UserAcquaintanceDTO } from "../../types/dto/userAcquaintance.dto";
+import { UserEntity } from "../../types/entities/user.entity";
+
+export function toUserAcquaintanceDTO(
+  user: UserEntity,
+  isVerified: boolean,
+  userProfile: {
+    favorites: string[];
+    flagged: string[];
+    known: string[];
+    refresh: string[];
+    collections: string[];
+    venues: string[];
+    friendsCount: number;
+    followingCount: number;
+    followersCount: number;
+    mutualFriendsCount: number;
+  }
+): UserAcquaintanceDTO {
+  return {
+    id: user._id,
+    username: user.username || user.name || '',
+    image: user.image || '',
+    bio: user.bio || '',
+    isVerified,
+    profile: {
+      dances: {
+        favorites: userProfile.favorites,
+        flagged: userProfile.flagged,
+        known: userProfile.known,
+        refresh: userProfile.refresh,
+      },
+      collections: userProfile.collections,
+      venues: userProfile.venues,
+      friendsCount: userProfile.friendsCount,
+      followingCount: userProfile.followingCount,
+      followersCount: userProfile.followersCount,
+      mutualFriendsCount: userProfile.mutualFriendsCount,
+      links: user.links ?? {},
+    },
+  };
+}

package/src/lib/converters/toUserAcquaintanceModel.ts

@@ -0,0 +1,36 @@
+import { ChoreographerDTO } from "../../types/dto/choreographer.dto";
+import { CollectionDTO } from "../../types/dto/collection.dto";
+import { DanceDTO } from "../../types/dto/dance.dto";
+import { TrackDTO } from "../../types/dto/track.dto";
+import { UserAcquaintanceDTO } from "../../types/dto/userAcquaintance.dto";
+import { UserAcquaintanceModel } from "../../types/model/userAcquaintance.model";
+import { toCollectionModel } from "./toCollectionsModel";
+import { toDanceModel } from "./toDanceModel";
+
+export function toUserAcquaintanceModel(
+    dto: UserAcquaintanceDTO,
+    danceMap: Record<string, DanceDTO>,
+    trackMap: Record<string, TrackDTO>,
+    collectionMap: Record<string, CollectionDTO>,
+    choreographerMap: Record<string, ChoreographerDTO>
+): UserAcquaintanceModel {
+
+    return {
+        id: dto.id,
+        username: dto.username,
+        image: dto.image,
+        bio: dto.bio,
+        isVerified: dto.isVerified,
+        friendsCount: dto.profile.friendsCount,
+        followersCount: dto.profile.followersCount,
+        mutualFriendsCount: dto.profile.mutualFriendsCount,
+        links: dto.profile.links,
+        dances: {
+            favorites: dto.profile.dances.favorites.map(id => toDanceModel(danceMap[id], trackMap, choreographerMap)),
+            flagged: dto.profile.dances.flagged.map(id => toDanceModel(danceMap[id], trackMap, choreographerMap)),
+            known: dto.profile.dances.known.map(id => toDanceModel(danceMap[id], trackMap, choreographerMap)),
+            refresh: dto.profile.dances.refresh.map(id => toDanceModel(danceMap[id], trackMap, choreographerMap))
+        },
+        collections: dto.profile.collections.map(id => toCollectionModel(collectionMap[id], danceMap, trackMap, choreographerMap)),
+    };
+}

package/src/lib/converters/toUserDTO.ts

@@ -0,0 +1,41 @@
+import { UserDTO } from "../../types/dto/user.dto";
+import { UserEntity } from "../../types/entities/user.entity";
+
+export function toUserDTO(
+    user: UserEntity,
+    isVerified: boolean,
+    danceIds: {
+        favorites: string[];
+        flagged: string[];
+        known: string[];
+        refresh: string[];
+    },
+    collections: string[],
+    venues: string[] = [],
+    friends: string[] = [],
+    following: string[] = [],
+    friendsRequested: string[] = [],
+    friendRequests: string[] = []
+): UserDTO {
+    return {
+        _id: user._id.toString(),
+        email: user.email ?? '',
+        name: user.name ?? '',
+        username: user.username ?? '',
+        image: user.image ?? '',
+        bio: user.bio ?? '',
+        isVerified,
+        profile: {
+            danceIds,
+            collections,
+            venues,
+            friends,
+            following,
+            links: user.links ?? {},
+            friendsRequested,
+            friendRequests
+        },
+    };
+};
+
+export default toUserDTO;

package/src/lib/converters/toUserModel.ts

@@ -0,0 +1,43 @@
+import { UserDTO } from "../../types/dto/user.dto";
+import { CollectionModel } from "../../types/model/collection.model";
+import { DanceModel } from "../../types/model/dance.model";
+import { UserModel } from "../../types/model/user.model";
+import { UserAcquaintanceModel } from "../../types/model/userAcquaintance.model";
+import { VenueModel } from "../../types/model/venue.model";
+
+export function toUserModel(
+    userDTO: UserDTO,
+    danceMap: Record<string, DanceModel>,
+    collectionMap: Record<string, CollectionModel>,
+    venueMap: Record<string, VenueModel>,
+    friendsMap: Record<string, UserAcquaintanceModel>,
+    followingMap: Record<string, UserAcquaintanceModel>
+): UserModel {
+    const expand = <T>(ids: string[], map: Record<string, T>): T[] => ids.map(id => map[id]).filter(Boolean);
+
+    return {
+        _id: userDTO._id,
+        email: userDTO.email,
+        name: userDTO.name,
+        username: userDTO.username,
+        image: userDTO.image,
+        bio: userDTO.bio,
+        isVerified: userDTO.isVerified,
+        profile: {
+            dances: {
+                favorites: expand(userDTO.profile.danceIds.favorites, danceMap),
+                flagged: expand(userDTO.profile.danceIds.flagged, danceMap),
+                known: expand(userDTO.profile.danceIds.known, danceMap),
+                refresh: expand(userDTO.profile.danceIds.refresh, danceMap),
+            },
+            collections: expand(userDTO.profile.collections, collectionMap),
+            venues: expand(userDTO.profile.venues, venueMap),
+            friends: expand(userDTO.profile.friends, friendsMap),
+            following: expand(userDTO.profile.following, followingMap),
+            friendsRequested: expand(userDTO.profile.friendsRequested, friendsMap),
+            friendRequests: expand(userDTO.profile.friendRequests, friendsMap),
+            followersCount: userDTO.profile.followersCount || 0,
+            links: userDTO.profile.links,
+        },
+    };
+}

package/src/lib/converters/toVenueDTO.ts

@@ -0,0 +1,26 @@
+import { VenueDTO } from "../../types/dto/venue.dto";
+import { VenueEntity } from "../../types/entities/venue.entity";
+
+export function toVenueDTO(
+    venue: VenueEntity,
+    lessonIds: string[],
+    isVerified: boolean
+): VenueDTO {
+
+    return {
+        id: venue._id,
+        venuename: venue.venuename,
+        venueaddress: venue.venueaddress,
+        geolocation: venue.geolocation,
+        phone: venue.phone,
+        website: venue.website,
+        contactEmail: venue.contactEmail,
+        contactName: venue.contactName,
+        contactPhone: venue.contactPhone,
+        lessonsIds: lessonIds,
+        isVerified: isVerified,
+        isDeleted: venue.isDeleted ?? false,
+        deletedAt: venue.deletedAt ?? null,
+        createdAt: venue.createdAt ?? null,
+    };
+}

package/src/lib/converters/toVenueModel.ts

@@ -0,0 +1,20 @@
+import { InstructorDTO } from "../../types/dto/instructor.dto";
+import { LessonDTO } from "../../types/dto/lesson.dto";
+import { VenueDTO } from "../../types/dto/venue.dto";
+import { VenueModel } from "../../types/model/venue.model";
+import { toLessonModel } from "./toLessonModel";
+
+export function toVenueModel(
+    venueDTO: VenueDTO,
+    lessonMap: Record<string, LessonDTO>,
+    instructorMap: Record<string, InstructorDTO>
+): VenueModel {
+    const expandedLessons = venueDTO.lessonsIds
+        .map(id => toLessonModel(lessonMap[id], instructorMap))
+        .filter(Boolean);
+
+    return {
+        ...venueDTO,
+        lessons: expandedLessons,
+    };
+}

package/src/types/dto/lesson.dto.ts

@@ -1,4 +1,5 @@
 export interface LessonDTO {
+    id: string;
     lessonday: string;
     lessonstart: string;
     instructors: string[];

package/src/types/entities/appeal_choreographer_user.entity.ts

@@ -0,0 +1,8 @@
+export interface AppealChoreographerUser {
+    userId: string;
+    choreographerId: string;
+    phoneNumber: string;
+    email: string;
+    createdAt: Date;
+    resolved: boolean;
+}

package/src/types/entities/appeal_instructor_user.entity.ts

@@ -0,0 +1,8 @@
+export interface AppealInstructorUser {
+    userId: string;
+    instructorId: string;
+    phoneNumber: string;
+    email: string;
+    createdAt: Date;
+    resolved: boolean;
+}

package/src/types/entities/cancelled_lesson.entity.ts

@@ -0,0 +1,6 @@
+export interface CancelledLessonEntity {
+  _id?: string;
+  lessonId: string;
+  date: Date;
+  createdAt: Date;
+}

package/src/types/entities/choreographer.entity.ts

@@ -0,0 +1,5 @@
+export interface ChoreographerEntity {
+    _id: string;
+    associatedUserId: string;
+    name: string;
+}

package/src/types/entities/dance.entity.ts

@@ -0,0 +1,9 @@
+export interface DanceEntity {
+    _id: string;
+    danceName: string;
+    choreographers: string[];
+    stepsheet: string;
+    difficulty: string;
+    primaryTrack: string;
+    tracks: string[];
+}

package/src/types/entities/dance_collection.entity.ts

@@ -0,0 +1,8 @@
+export interface DanceCollectionEntity {
+  _id: string;
+  name: string;
+  danceIds: string[];
+  createdBy: string;
+  createdAt: Date;
+  isPrivate: boolean;
+}

package/src/types/entities/friend_request.entity.ts

@@ -0,0 +1,7 @@
+export interface FriendRequestEntity {
+  _id: string;
+  requesterId: string;
+  requesteeId: string;
+  status: 'pending' | 'accepted' | 'declined';
+  createdAt: Date;
+}

package/src/types/entities/instructor.entity.ts

@@ -0,0 +1,5 @@
+export interface InstructorEntity {
+    _id: string;
+    name: string;
+    associatedUserId: string | null;
+}

package/src/types/entities/lesson.entity.ts

@@ -0,0 +1,13 @@
+export interface LessonEntity {
+    _id: string;
+    venueid: string;
+    title: string;
+    description: string;
+    lessonday: string;
+    lessonstart: string;
+    instructors: string[];
+    duration: string;
+    lessoncost: string;
+    notes: string;
+    difficulty: string;
+}

package/src/types/entities/track.entity.ts

@@ -0,0 +1,9 @@
+export interface TrackEntity {
+    _id: string;
+    name: string;
+    artists: string[];
+    isrc: string;
+    uri: string;
+    duration_ms: number;
+    explicit: boolean;
+}