@glissandoo/lib 1.104.12 → 1.104.14

package/helpers/collections.d.ts

@@ -7,6 +7,7 @@ export declare enum CollectionNames {
     User = "user",
     UserGroups = "groups",
     UserNotifications = "notifications",
+    UserOfferAlarms = "offerAlarms",
     Counters = "database",
     Records = "records",
     Event = "event",

package/helpers/collections.js

@@ -11,6 +11,7 @@ var CollectionNames;
     CollectionNames["User"] = "user";
     CollectionNames["UserGroups"] = "groups";
     CollectionNames["UserNotifications"] = "notifications";
+    CollectionNames["UserOfferAlarms"] = "offerAlarms";
     CollectionNames["Counters"] = "database";
     CollectionNames["Records"] = "records";
     CollectionNames["Event"] = "event";

package/helpers/utils.js

@@ -10,7 +10,10 @@ const sortByMatch = (list, field, order) => {
     const [match, noMatch] = (0, lodash_1.partition)(list, (item) => order.includes((0, get_1.default)(item, field)));
     const sortedmatch = (0, lodash_1.sortBy)(match, [
         (player) => order.indexOf((0, get_1.default)(player, field)),
-        'displayName',
+        (player) => {
+            const displayName = (0, get_1.default)(player, 'displayName');
+            return typeof displayName === 'string' ? displayName.toLowerCase() : '';
+        },
     ]);
     const sortedNoMatch = (0, lodash_1.orderBy)(noMatch, field, 'asc');
     return [...sortedmatch, ...sortedNoMatch];

package/models/Offer/index.js

@@ -73,7 +73,9 @@ class Offer extends lang_2.default {
         return this.data.timezone || 'Europe/Madrid';
     }
     get isResponseAllowed() {
-        return (!this.isSelectionClosed && (this.deadlineAt ? (0, date_fns_1.isFuture)(this.deadlineAt.toDate()) : true));
+        return (this.isActive &&
+            !this.isSelectionClosed &&
+            (this.deadlineAt ? (0, date_fns_1.isFuture)(this.deadlineAt.toDate()) : true));
     }
     get selectionClosedAt() {
         return this.data.selectionClosedAt || null;

package/models/User/OfferAlarm/index.d.ts

@@ -0,0 +1,15 @@
+import { LanguagesTypes } from '../../../lang';
+import Model, { DocumentModel } from '../../Model';
+import { UserOfferAlarmData } from './types';
+export default class UserOfferAlarm extends Model<UserOfferAlarmData> {
+    private lang;
+    constructor(doc: DocumentModel, lang?: LanguagesTypes);
+    get userId(): string;
+    get locality(): string | null;
+    get location(): FirebaseFirestore.GeoPoint;
+    get country(): string | null;
+    get instrument(): import("../../../helpers/instruments").DefaultInstrumentId | null;
+    get musicStyle(): string | null;
+    get distance(): number | null;
+    get createdAt(): FirebaseFirestore.Timestamp;
+}

package/models/User/OfferAlarm/index.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../../helpers/utils");
+const lang_1 = require("../../../lang");
+const Model_1 = __importDefault(require("../../Model"));
+class UserOfferAlarm extends Model_1.default {
+    constructor(doc, lang = lang_1.defaultLocale) {
+        super(doc);
+        this.lang = lang;
+    }
+    get userId() {
+        return (0, utils_1.at)(this.ref.path.split('/'), 1) || '';
+    }
+    get locality() {
+        return this.data.locality || null;
+    }
+    get location() {
+        return this.data.location || null;
+    }
+    get country() {
+        return this.data.country || null;
+    }
+    get instrument() {
+        return this.data.instrument || null;
+    }
+    get musicStyle() {
+        return this.data.musicStyle || null;
+    }
+    get distance() {
+        return this.data.distance || null;
+    }
+    get createdAt() {
+        return this.data.createdAt;
+    }
+}
+exports.default = UserOfferAlarm;

package/models/User/OfferAlarm/types.d.ts

@@ -0,0 +1,11 @@
+import { GeoPoint, Timestamp } from '@google-cloud/firestore';
+import { DefaultInstrumentId } from '../../../helpers/instruments';
+export interface UserOfferAlarmData {
+    locality: string;
+    location: GeoPoint;
+    country: string;
+    distance: number;
+    instrument: DefaultInstrumentId | null;
+    musicStyle: string | null;
+    readonly createdAt: Timestamp;
+}

package/models/User/OfferAlarm/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/User/index.d.ts

@@ -35,6 +35,15 @@ export default class User extends UserExtended<UserData> {
         default_events_filter: UserEventsFilter;
         repertoire_order_by: RepertoireFilterBy;
         repertoire_order_direction: RepertoireFilterDirection;
+        offers_filter_locality: string | null;
+        offers_filter_location: {
+            latitude: number;
+            longitude: number;
+        } | null;
+        offers_filter_country: string | null;
+        offers_filter_distance: number;
+        offers_filter_instrument: import("../../helpers/instruments").InstrumentId | null;
+        offers_filter_music_style: import("../../helpers/musicStyles").MusicStyleId | null;
     };
     get dashboardConfig(): {
         default_group_id: string | null;
@@ -55,6 +64,15 @@ export default class User extends UserExtended<UserData> {
         default_events_filter: UserEventsFilter;
         repertoire_order_by: RepertoireFilterBy;
         repertoire_order_direction: RepertoireFilterDirection;
+        offers_filter_locality: string | null;
+        offers_filter_location: {
+            latitude: number;
+            longitude: number;
+        } | null;
+        offers_filter_country: string | null;
+        offers_filter_distance: number;
+        offers_filter_instrument: import("../../helpers/instruments").InstrumentId | null;
+        offers_filter_music_style: import("../../helpers/musicStyles").MusicStyleId | null;
     }[T];
     getNotificationSetting(key: UserNotificationSettings): boolean;
     getNotificationByGroup(groupId: string): number;

package/models/User/index.js

@@ -90,52 +90,47 @@ class User extends extended_1.default {
         return !this.exists || !(0, lodash_1.isNull)(this.deletedAt);
     }
     get appConfig() {
-        const { appConfig = {
+        const defaultConfig = {
             [types_2.UserAppConfig.DefaultGroupId]: null,
             [types_2.UserAppConfig.DefaultEventsFilter]: types_2.UserEventsFilter.Trimonth,
             [types_2.UserAppConfig.RepertoireOrderBy]: types_1.RepertoireFilterBy.CreatedAt,
             [types_2.UserAppConfig.RepertoireOrderDirection]: types_1.RepertoireFilterDirection.Desc,
-        }, } = this.data;
-        return {
-            [types_2.UserAppConfig.DefaultGroupId]: types_2.UserAppConfig.DefaultGroupId in appConfig
-                ? appConfig[types_2.UserAppConfig.DefaultGroupId]
-                : null,
-            [types_2.UserAppConfig.DefaultEventsFilter]: types_2.UserAppConfig.DefaultEventsFilter in appConfig
-                ? appConfig[types_2.UserAppConfig.DefaultEventsFilter]
-                : types_2.UserEventsFilter.Trimonth,
-            [types_2.UserAppConfig.RepertoireOrderBy]: types_2.UserAppConfig.RepertoireOrderBy in appConfig
-                ? appConfig[types_2.UserAppConfig.RepertoireOrderBy]
-                : types_1.RepertoireFilterBy.CreatedAt,
-            [types_2.UserAppConfig.RepertoireOrderDirection]: types_2.UserAppConfig.RepertoireOrderDirection in appConfig
-                ? appConfig[types_2.UserAppConfig.RepertoireOrderDirection]
-                : types_1.RepertoireFilterDirection.Desc,
+            [types_2.UserAppConfig.OffersFilterLocality]: null,
+            [types_2.UserAppConfig.OffersFilterLocation]: null,
+            [types_2.UserAppConfig.OffersFilterDistance]: 1000,
+            [types_2.UserAppConfig.OffersFilterInstrument]: null,
+            [types_2.UserAppConfig.OffersFilterMusicStyle]: null,
+            [types_2.UserAppConfig.OffersFilterCountry]: null,
         };
+        const { appConfig = defaultConfig } = this.data;
+        const values = Object.values(types_2.UserAppConfig).reduce((acc, key) => {
+            if (key in acc)
+                return acc;
+            return {
+                ...acc,
+                [key]: defaultConfig[key],
+            };
+        }, appConfig);
+        return values;
     }
     get dashboardConfig() {
-        const { dashboardConfig = {
+        const defaultConfig = {
             [types_2.UserDashboardConfig.DefaultGroupId]: null,
             [types_2.UserDashboardConfig.DefaultPartnershipId]: null,
             [types_2.UserDashboardConfig.RepertoireOrderBy]: types_1.RepertoireFilterBy.CreatedAt,
             [types_2.UserDashboardConfig.RepertoireOrderDirection]: types_1.RepertoireFilterDirection.Desc,
             [types_2.UserDashboardConfig.EventsType]: null,
-        }, } = this.data;
-        return {
-            [types_2.UserDashboardConfig.DefaultGroupId]: types_2.UserDashboardConfig.DefaultGroupId in dashboardConfig
-                ? dashboardConfig[types_2.UserDashboardConfig.DefaultGroupId]
-                : null,
-            [types_2.UserDashboardConfig.DefaultPartnershipId]: types_2.UserDashboardConfig.DefaultPartnershipId in dashboardConfig
-                ? dashboardConfig[types_2.UserDashboardConfig.DefaultPartnershipId]
-                : null,
-            [types_2.UserDashboardConfig.RepertoireOrderBy]: types_2.UserDashboardConfig.RepertoireOrderBy in dashboardConfig
-                ? dashboardConfig[types_2.UserDashboardConfig.RepertoireOrderBy]
-                : types_1.RepertoireFilterBy.CreatedAt,
-            [types_2.UserDashboardConfig.RepertoireOrderDirection]: types_2.UserDashboardConfig.RepertoireOrderDirection in dashboardConfig
-                ? dashboardConfig[types_2.UserDashboardConfig.RepertoireOrderDirection]
-                : types_1.RepertoireFilterDirection.Desc,
-            [types_2.UserDashboardConfig.EventsType]: types_2.UserDashboardConfig.EventsType in dashboardConfig
-                ? dashboardConfig[types_2.UserDashboardConfig.EventsType]
-                : null,
         };
+        const { dashboardConfig = defaultConfig } = this.data;
+        const values = Object.values(types_2.UserDashboardConfig).reduce((acc, key) => {
+            if (key in acc)
+                return acc;
+            return {
+                ...acc,
+                [key]: defaultConfig[key],
+            };
+        }, dashboardConfig);
+        return values;
     }
     getDashboardConfig(value) {
         return this.dashboardConfig[value];

package/models/User/types.d.ts

@@ -1,4 +1,6 @@
 import { GeoPoint, Timestamp } from '@google-cloud/firestore';
+import { InstrumentId } from '../../helpers/instruments';
+import { MusicStyleId } from '../../helpers/musicStyles';
 import { LanguagesTypes } from '../../lang';
 import { EventType } from '../Evento/types';
 import { RepertoireFilterBy, RepertoireFilterDirection } from '../Repertory/types';
@@ -14,7 +16,13 @@ export declare enum UserAppConfig {
     DefaultGroupId = "default_group_id",
     DefaultEventsFilter = "default_events_filter",
     RepertoireOrderBy = "repertoire_order_by",
-    RepertoireOrderDirection = "repertoire_order_direction"
+    RepertoireOrderDirection = "repertoire_order_direction",
+    OffersFilterLocality = "offers_filter_locality",
+    OffersFilterLocation = "offers_filter_location",
+    OffersFilterDistance = "offers_filter_distance",
+    OffersFilterCountry = "offers_filter_country",
+    OffersFilterInstrument = "offers_filter_instrument",
+    OffersFilterMusicStyle = "offers_filter_music_style"
 }
 export declare enum UserDashboardConfig {
     DefaultGroupId = "default_group_id",
@@ -97,6 +105,15 @@ export interface UserData extends UserExtendedData {
         [UserAppConfig.DefaultEventsFilter]: UserEventsFilter;
         [UserAppConfig.RepertoireOrderBy]: RepertoireFilterBy;
         [UserAppConfig.RepertoireOrderDirection]: RepertoireFilterDirection;
+        [UserAppConfig.OffersFilterLocality]: string | null;
+        [UserAppConfig.OffersFilterLocation]: {
+            latitude: number;
+            longitude: number;
+        } | null;
+        [UserAppConfig.OffersFilterCountry]: string | null;
+        [UserAppConfig.OffersFilterDistance]: number;
+        [UserAppConfig.OffersFilterInstrument]: InstrumentId | null;
+        [UserAppConfig.OffersFilterMusicStyle]: MusicStyleId | null;
     };
     analyticsEnabled: boolean;
     registerVia: UserRegisterVia;

package/models/User/types.js

@@ -17,6 +17,12 @@ var UserAppConfig;
     UserAppConfig["DefaultEventsFilter"] = "default_events_filter";
     UserAppConfig["RepertoireOrderBy"] = "repertoire_order_by";
     UserAppConfig["RepertoireOrderDirection"] = "repertoire_order_direction";
+    UserAppConfig["OffersFilterLocality"] = "offers_filter_locality";
+    UserAppConfig["OffersFilterLocation"] = "offers_filter_location";
+    UserAppConfig["OffersFilterDistance"] = "offers_filter_distance";
+    UserAppConfig["OffersFilterCountry"] = "offers_filter_country";
+    UserAppConfig["OffersFilterInstrument"] = "offers_filter_instrument";
+    UserAppConfig["OffersFilterMusicStyle"] = "offers_filter_music_style";
 })(UserAppConfig = exports.UserAppConfig || (exports.UserAppConfig = {}));
 var UserDashboardConfig;
 (function (UserDashboardConfig) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@glissandoo/lib",
-	"version": "1.104.12",
+	"version": "1.104.14",
 	"description": "Glissandoo library js",
 	"main": "./index.js",
 	"types": "./index.d.ts",