ldco-contract 0.1.9 → 0.1.11

package/dist/types/model/userTypes/userDances.d.ts

@@ -0,0 +1,7 @@
+import { DanceModel } from "../dance.model";
+export interface UserDances {
+    favorites: DanceModel[];
+    flagged: DanceModel[];
+    known: DanceModel[];
+    refresh: DanceModel[];
+}

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

@@ -0,0 +1,13 @@
+import { LessonModel } from "./lesson.model";
+export interface VenueModel {
+    venuename: string;
+    venueaddress: string;
+    geolocation: [number, number];
+    phone: string;
+    website: string;
+    contactEmail: string;
+    contactName: string;
+    contactPhone: string;
+    lessons: LessonModel[];
+    isVerified: boolean;
+}

package/package.json

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

package/src/converter/userEntityToUser.ts

@@ -31,6 +31,7 @@ export async function convertUserToModel(
     _id: u._id,
     email: u.email,
     name: u.name,
+    username: u.username || "",
     image: u.image,
     bio: u.bio,
     friends: u.friends || [],
@@ -67,6 +68,7 @@ export async function convertUserToModel(
     _id: user._id,
     email: user.email,
     name: user.name,
+    username: user.username || "",
     image: user.image,
     bio: user.bio,
     profile,

package/src/entities/friend.entity.ts

@@ -0,0 +1,10 @@
+export default class FriendEntity {
+    constructor(obj: Partial<FriendEntity>) {
+        Object.assign(this, obj);
+    }
+
+    _id!: string;
+    userA!: string;
+    userB!: string;
+    timestamp!: Date;
+}

package/src/index.ts

@@ -1,15 +1,31 @@
-export { default as Collection } from './models/collection.model';
-export { default as Dance } from './models/dance.model';
-export { default as FriendRequest } from './entities/friendRequest.entity';
-export { default as Instructor } from './models/instructor.model';
-export { default as Lesson } from './models/lesson.model';
-export { default as ProfileData } from './models/profileData.model';
-export { default as SocialMediaLinks } from './models/socialMediaLinks.model';
-export { default as Track } from './models/track.model';
-export { default as User } from './models/user.model';
-export { default as UserAcquaintance } from './models/userAcquaintance.model';
-export { default as UserDances } from './models/userDances.model';
-export { default as Venue } from './models/venue.model';
+// DTOS
+export { ChoreographerDTO } from './types/dto/choreographer.dto';
+export { CollectionDTO } from './types/dto/collection.dto';
+export { DanceDTO } from './types/dto/dance.dto';
+export { FriendDTO } from './types/dto/friend.dto';
+export { FriendRequestDTO } from './types/dto/friendRequest.dto';
+export { InstructorDTO } from './types/dto/instructor.dto';
+export { LessonDTO } from './types/dto/lesson.dto';
+export { TrackDTO } from './types/dto/track.dto';
+export { UserDTO } from './types/dto/user.dto';
+export { UserAcquaintanceDTO } from './types/dto/userAcquaintance.dto';
+export { VenueDTO } from './types/dto/venue.dto';
 
-export { UserEntity } from './entities/user.entity';
+// MODELS
+export { ChoreographerModel } from './types/model/choreographer.model';
+export { CollectionModel } from './types/model/collection.model';
+export { DanceModel } from './types/model/dance.model';
+export { InstructorModel } from './types/model/instructor.model';
+export { LessonModel } from './types/model/lesson.model';
+export { TrackModel } from './types/model/track.model';
+export { UserModel } from './types/model/user.model';
+export { UserAcquaintanceModel } from './types/model/userAcquaintance.model';
+export { VenueModel } from './types/model/venue.model';
+
+// USER TYPES
+export { ProfileData } from './types/model/userTypes/profileData';
+export { SocialMediaLinks } from './types/model/userTypes/socialMediaLinks';
+export { UserDances } from './types/model/userTypes/userDances';
+
+// LIB FUNCTIONS
 export { getAllUserDanceIds } from './lib/getAllUserDanceIds';

package/src/lib/getAllUserDanceIds.ts

@@ -1,6 +1,7 @@
-import UserDances from "../models/userDances.model";
+import { DanceModel } from "../types/model/dance.model";
+import { UserDances } from "../types/model/userTypes/userDances";
 
-export function getAllUserDanceIds(userDances: Partial<UserDances>): string[] {
+export function getAllUserDanceIds(userDances: UserDances): DanceModel[] {
     const { favorites = [], flagged = [], known = [], refresh = [] } = userDances ?? {};
 
     const all = [
@@ -10,5 +11,5 @@ export function getAllUserDanceIds(userDances: Partial<UserDances>): string[] {
         ...refresh,
     ];
 
-    return Array.from(new Set(all));
-}
+    return all.filter((item, index) => all.indexOf(item) === index);
+}

package/src/types/dto/choreographer.dto.ts

@@ -0,0 +1,5 @@
+export interface ChoreographerDTO {
+    id: string;
+    name: string;
+    isVerified: boolean;
+}

package/src/types/dto/collection.dto.ts

@@ -0,0 +1,13 @@
+export interface CollectionDTO {
+    _id: string;
+    name: string;
+    dances: string[];
+    createdAt: Date;
+    updatedAt: Date;
+    createdBy: string;
+    isPrivate: boolean; // TODO: Private collections should not be returned in public APIs
+    isCopyable: boolean;
+
+    // Added Data
+    isVerified: boolean;
+}

package/src/types/dto/dance.dto.ts

@@ -0,0 +1,10 @@
+export interface DanceDTO {
+    id: string;
+    danceName: string;
+    choreographers: string[];
+    stepsheet: string;
+    difficulty: string;
+    primaryTrack: string;
+    tracks: string[];
+    isVerified: boolean;
+}

package/src/types/dto/friend.dto.ts

@@ -0,0 +1,6 @@
+export interface FriendDTO {
+    _id: string;
+    userA: string;
+    userB: string;
+    timestamp: Date;
+}

package/src/types/dto/friendRequest.dto.ts

@@ -0,0 +1,7 @@
+export interface FriendRequestDTO {
+    _id: string;
+    requester: string;
+    requestee: string;
+    status: string;
+    timestamp: Date;
+}

package/src/types/dto/instructor.dto.ts

@@ -0,0 +1,6 @@
+export interface InstructorDTO {
+    id: string;
+    name: string;
+    userid: string;
+    isVerified: boolean;
+}

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

@@ -0,0 +1,10 @@
+export interface LessonDTO {
+    lessonday: string;
+    lessonstart: string;
+    instructors: string[];
+    duration: string;
+    lessoncost: string;
+    notes: string;
+    difficulty: string;
+    isVerified: boolean;
+}

package/src/types/dto/track.dto.ts

@@ -0,0 +1,12 @@
+export interface TrackDTO {
+    id: string;
+    name: string;
+    artists: string[];
+    isrc: string;
+    uri: string;
+    duration_ms: number;
+    explicit: boolean;
+    is_playable: boolean;
+    preview_url: string;
+    isVerified: boolean;
+}

package/src/types/dto/user.dto.ts

@@ -0,0 +1,25 @@
+export interface UserDTO {
+  _id: string;
+  email: string;
+  name: string;
+  username: string;
+  image: string;
+  bio: string;
+  isVerified: boolean;
+  profile: {
+    danceIds: {
+      favorites: string[];
+      flagged: string[];
+      known: string[];
+      refresh: string[];
+    };
+    collections: string[];
+    venues: string[];
+    friends: string[];
+    following: string[];
+    friendsRequested: string[];
+    friendRequests: string[];
+    followersCount?: number;
+    links: Record<string, string>;
+  };
+}

package/src/types/dto/userAcquaintance.dto.ts

@@ -0,0 +1,22 @@
+export interface UserAcquaintanceDTO {
+    id: string;
+    username: string;
+    image: string;
+    bio: string;
+    isVerified: boolean;
+    profile: {
+        dances: {
+            favorites: string[];
+            flagged: string[];
+            known: string[];
+            refresh: string[];
+        };
+        collections: string[];
+        venues: string[];
+        friendsCount: number;
+        followingCount: number;
+        followersCount: number;
+        mutualFriendsCount: number;
+        links: Record<string, string>;
+    };
+};

package/src/types/dto/venue.dto.ts

@@ -0,0 +1,15 @@
+export interface VenueDTO {
+    id: string;
+    venuename: string;
+    venueaddress: string;
+    geolocation: [number, number];
+    phone: string;
+    website: string;
+    contactEmail: string;
+    contactName: string;
+    contactPhone: string;
+
+    // Added Data
+    lessonsIds: string[];
+    isVerified: boolean;
+}

package/src/types/model/choreographer.model.ts

@@ -0,0 +1,5 @@
+export interface ChoreographerModel {
+    id: string;
+    name: string;
+    isVerified: boolean;
+}

package/src/types/model/collection.model.ts

@@ -0,0 +1,11 @@
+import { DanceModel } from "./dance.model";
+
+export interface CollectionModel {
+    name: string;
+    dances: DanceModel[];
+    createdAt: Date;
+    updatedAt: Date;
+    createdBy: string;
+    isCopyable: boolean;
+    isVerified: boolean;
+}

package/src/types/model/dance.model.ts

@@ -0,0 +1,12 @@
+import { ChoreographerModel } from './choreographer.model';
+import { TrackModel } from './track.model';
+
+export interface DanceModel {
+    danceName: string;
+    choreographers: ChoreographerModel[];
+    stepsheet: string;
+    difficulty: string;
+    isVerified: boolean;
+    primaryTrack: TrackModel;
+    tracks: TrackModel[];
+}

package/src/types/model/instructor.model.ts

@@ -0,0 +1,6 @@
+export interface InstructorModel {
+    id: string;
+    name: string;
+    userid: string;
+    isVerified: boolean;
+}

package/src/types/model/lesson.model.ts

@@ -0,0 +1,11 @@
+import { InstructorModel } from "./instructor.model";
+
+export interface LessonModel {
+    lessonday: string;
+    lessonstart: string;
+    instructors: InstructorModel[];
+    duration: string;
+    lessoncost: string;
+    notes: string;
+    difficulty: string;
+}

package/src/types/model/track.model.ts

@@ -0,0 +1,12 @@
+export interface TrackModel {
+    id: string;
+    name: string;
+    artists: string[];
+    isrc: string;
+    uri: string;
+    duration_ms: number;
+    explicit: boolean;
+    is_playable: boolean;
+    preview_url: string;
+    isVerified: boolean;
+}

package/src/types/model/user.model.ts

@@ -0,0 +1,12 @@
+import { ProfileData } from "./userTypes/profileData";
+
+export interface UserModel {
+    _id: string;
+    email: string;
+    name: string;
+    username: string;
+    image: string;
+    bio: string;
+    profile: ProfileData;
+    isVerified: boolean; // TODO: This makes sense on a UserAquaintanceModel, but is it still useful on a UserModel?
+}

package/src/types/model/userAcquaintance.model.ts

@@ -0,0 +1,17 @@
+import { CollectionModel } from "./collection.model";
+import { SocialMediaLinks } from "./userTypes/socialMediaLinks";
+import { UserDances } from "./userTypes/userDances";
+
+export interface UserAcquaintanceModel {
+    id: string;
+    username: string;
+    image: string;
+    bio: string;
+    dances: UserDances;
+    collections: CollectionModel[];
+    followersCount: number;
+    friendsCount: number;
+    mutualFriendsCount: number;
+    links?: SocialMediaLinks;
+    isVerified: boolean;
+}

package/src/types/model/userTypes/profileData.ts

@@ -0,0 +1,17 @@
+import { CollectionModel } from "../collection.model";
+import { UserDances } from "../userDances.model";
+import { SocialMediaLinks } from "./socialMediaLinks";
+import { UserAcquaintanceModel } from "../userAquaintance";
+import { VenueModel } from "../venue.model";
+
+export interface ProfileData {
+    dances: UserDances;
+    collections: CollectionModel[];
+    venues: VenueModel[];
+    friends: UserAcquaintanceModel[];
+    following: UserAcquaintanceModel[];
+    friendsRequested: UserAcquaintanceModel[];
+    friendRequests: UserAcquaintanceModel[];
+    followersCount: number;
+    links: SocialMediaLinks;
+}

package/src/{models/socialMediaLinks.model.ts → types/model/userTypes/socialMediaLinks.ts}

@@ -1,4 +1,4 @@
-export default class SocialMediaLinks {
+export interface SocialMediaLinks {
     facebook?: string;
     twitter?: string;
     instagram?: string;

package/src/types/model/userTypes/userDances.ts

@@ -0,0 +1,8 @@
+import { DanceModel } from "../dance.model";
+
+export interface UserDances {
+    favorites: DanceModel[];
+    flagged: DanceModel[];
+    known: DanceModel[];
+    refresh: DanceModel[];
+}

package/src/types/model/venue.model.ts

@@ -0,0 +1,14 @@
+import { LessonModel } from "./lesson.model";
+
+export interface VenueModel {
+    venuename: string;
+    venueaddress: string;
+    geolocation: [number, number];
+    phone: string;
+    website: string;
+    contactEmail: string;
+    contactName: string;
+    contactPhone: string;
+    lessons: LessonModel[];
+    isVerified: boolean;
+}

package/dist/entities/user.entity.d.ts

@@ -1,17 +0,0 @@
-import Collection from "../models/collection.model";
-export interface UserEntity {
-    _id: string;
-    email: string;
-    name: string;
-    image?: string;
-    bio?: string;
-    favorites?: string[];
-    flagged?: string[];
-    known?: string[];
-    refresh?: string[];
-    collections?: Collection[];
-    venues?: string[];
-    friends?: string[];
-    following?: string[];
-    links?: Record<string, string>;
-}

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

@@ -1,5 +0,0 @@
-export default class Collection {
-    constructor(obj: Partial<Collection>);
-    name: string;
-    dances: string[];
-}

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

@@ -1,11 +0,0 @@
-import Track from "./track.model";
-export default class Dance {
-    constructor(obj: Partial<Dance>);
-    _id: string;
-    difficulty?: string;
-    tracks?: Track[];
-    primaryTrack?: Track;
-    danceName: string;
-    choreographers: string[];
-    stepsheet?: string;
-}

package/dist/models/instructor.model.d.ts

@@ -1,5 +0,0 @@
-export default class Instructor {
-    constructor(obj: Partial<Instructor>);
-    _id: string;
-    name: string;
-}

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

@@ -1,11 +0,0 @@
-export default class Lesson {
-    _id: string;
-    venueid: string;
-    lessonday: string;
-    lessonstart: string;
-    instructors: string[];
-    duration?: string;
-    lessoncost?: string;
-    notes?: string;
-    difficulty?: string;
-}

package/dist/models/profileData.model.d.ts

@@ -1,16 +0,0 @@
-import Collection from "./collection.model";
-import SocialMediaLinks from "./socialMediaLinks.model";
-import UserDances from "./userDances.model";
-import UserAcquaintance from "./userAcquaintance.model";
-export default class ProfileData {
-    constructor(data: Partial<ProfileData>);
-    dances: UserDances;
-    collections: Collection[];
-    venues: string[];
-    friends: UserAcquaintance[];
-    following: UserAcquaintance[];
-    friendsRequested: UserAcquaintance[];
-    friendRequests: UserAcquaintance[];
-    followersCount: number;
-    links: SocialMediaLinks;
-}

package/dist/models/track.model.d.ts

@@ -1,9 +0,0 @@
-export default class Track {
-    constructor(obj: Partial<Track>);
-    _id: string;
-    isrc?: string;
-    name: string;
-    artists: string[];
-    duration_ms?: number;
-    explicit?: boolean;
-}

package/dist/models/user.model.d.ts

@@ -1,10 +0,0 @@
-import ProfileData from "./profileData.model";
-export default class User {
-    constructor(data: Partial<User>);
-    _id: string;
-    email: string;
-    name: string;
-    image?: string;
-    bio?: string;
-    profile: ProfileData;
-}

package/dist/models/userAcquaintance.model.d.ts

@@ -1,19 +0,0 @@
-import UserDances from "./userDances.model";
-import SocialMediaLinks from "./socialMediaLinks.model";
-import Collection from "./collection.model";
-export default class UserAcquaintance {
-    constructor(data: Partial<UserAcquaintance>);
-    _id: string;
-    email: string;
-    name: string;
-    image?: string;
-    bio?: string;
-    friends: string[];
-    following: string[];
-    dances: UserDances;
-    collections: Collection[];
-    followersCount: number;
-    venuesCount: number;
-    mutualsCount: number;
-    links?: SocialMediaLinks;
-}

package/dist/models/userDances.model.d.ts

@@ -1,7 +0,0 @@
-export default class UserDances {
-    constructor(data?: Partial<UserDances>);
-    favorites: string[];
-    flagged: string[];
-    known: string[];
-    refresh: string[];
-}

package/dist/models/venue.model.d.ts

@@ -1,11 +0,0 @@
-import Lesson from "./lesson.model";
-export default class Venue {
-    constructor(obj: Partial<Venue>);
-    _id: string;
-    venuename: string;
-    venueaddress: string;
-    geolocation: [number, number];
-    phone?: string;
-    website?: string;
-    lessons?: Lesson[];
-}

package/src/entities/user.entity.ts

@@ -1,18 +0,0 @@
-import Collection from "../models/collection.model";
-
-export interface UserEntity {
-  _id: string;
-  email: string;
-  name: string;
-  image?: string;
-  bio?: string;
-  favorites?: string[];
-  flagged?: string[];
-  known?: string[];
-  refresh?: string[];
-  collections?: Collection[];
-  venues?: string[];
-  friends?: string[];
-  following?: string[];
-  links?: Record<string, string>;
-}

package/src/models/collection.model.ts

@@ -1,8 +0,0 @@
-export default class Collection {
-    constructor(obj: Partial<Collection>) {
-        Object.assign(this, obj);
-    }
-
-    name!: string;
-    dances: string[] = [];
-}

package/src/models/dance.model.ts

@@ -1,15 +0,0 @@
-import Track from "./track.model";
-
-export default class Dance {
-    constructor(obj: Partial<Dance>) {
-        Object.assign(this, obj);
-    }
-
-    _id!: string;
-    difficulty?: string;
-    tracks?: Track[] = [];
-    primaryTrack?: Track;
-    danceName!: string;
-    choreographers!: string[];
-    stepsheet?: string;
-}

package/src/models/instructor.model.ts

@@ -1,8 +0,0 @@
-export default class Instructor {
-    constructor(obj: Partial<Instructor>) {
-        Object.assign(this, obj);
-    }
-
-    _id!: string;
-    name!: string;
-}

package/src/models/lesson.model.ts

@@ -1,11 +0,0 @@
-export default class Lesson {
-    _id!: string;
-    venueid!: string;
-    lessonday!: string;
-    lessonstart!: string;
-    instructors!: string[];
-    duration?: string;
-    lessoncost?: string;
-    notes?: string;
-    difficulty?: string;
-}