@glissandoo/lib 1.86.0 → 1.87.0

package/functions/index.d.ts

@@ -123,7 +123,8 @@ export declare enum FbFunctionName {
     UserSendYearWrapped = "user-sendYearWrapped",
     OfferPublish = "offer-publish",
     OfferEdit = "offer-edit",
-    OfferEditSelection = "offer-editSelection",
+    OfferSelectApplicant = "offer-selectApplicant",
+    OfferViewApplicant = "offer-viewApplicant",
     OfferOnUpdate = "offer-onUpdate",
     OfferCloseSelection = "offer-closeSelection",
     OfferRemove = "offer-remove",

package/functions/index.js

@@ -127,7 +127,8 @@ var FbFunctionName;
     FbFunctionName["UserSendYearWrapped"] = "user-sendYearWrapped";
     FbFunctionName["OfferPublish"] = "offer-publish";
     FbFunctionName["OfferEdit"] = "offer-edit";
-    FbFunctionName["OfferEditSelection"] = "offer-editSelection";
+    FbFunctionName["OfferSelectApplicant"] = "offer-selectApplicant";
+    FbFunctionName["OfferViewApplicant"] = "offer-viewApplicant";
     FbFunctionName["OfferOnUpdate"] = "offer-onUpdate";
     FbFunctionName["OfferCloseSelection"] = "offer-closeSelection";
     FbFunctionName["OfferRemove"] = "offer-remove";

package/functions/offer.d.ts

@@ -1,27 +1,43 @@
-import { InstrumentId } from '../helpers/instruments';
+import { DefaultInstrumentId } from '../helpers/instruments';
+import { Descendant } from '../helpers/slate';
 import { OfferType } from '../models/Offer/types';
 export declare namespace OfferFbFunctionsTypes {
     interface PublishParams {
         offerId: string;
         title: string;
-        description: string;
-        instrument: InstrumentId;
+        description: Descendant[];
+        instrument: DefaultInstrumentId;
+        locality: string;
+        location: {
+            _latitude: number;
+            _longitude: number;
+        };
+        country: string;
         type: OfferType;
         group: string;
         event: string | null;
         deadlineAt: number | null;
+        timezone: string;
     }
     type PublishResult = void;
-    type EditParams = Pick<PublishParams, 'offerId' | 'title' | 'description' | 'deadlineAt'>;
+    type EditParams = Omit<PublishParams, 'instrument' | 'type' | 'group' | 'event'>;
     type EditResult = void;
-    interface EditSelectionParams {
+    interface SelectApplicantParams {
+        offerId: string;
+        userId: string;
+    }
+    type SelectApplicantResult = void;
+    interface ViewApplicantParams {
+        offerId: string;
+        userId: string;
+    }
+    type ViewApplicantResult = void;
+    interface CloseSelectionParams {
         offerId: string;
-        selectedApplicantsIds: string[];
-        discardedApplicantsIds: string[];
     }
-    type EditSelectionResult = void;
-    type CloseSelectionParams = Pick<PublishParams, 'offerId'>;
     type CloseSelectionResult = void;
-    type RemoveParams = Pick<PublishParams, 'offerId'>;
+    interface RemoveParams {
+        offerId: string;
+    }
     type RemoveResult = void;
 }

package/functions/offerApplicant.d.ts

@@ -1,12 +1,13 @@
 export declare namespace OfferApplicantFbFunctionsTypes {
     interface AddParams {
         offerId: string;
-        userId: string;
-        message: string | null;
+        message: string;
     }
     type AddResult = void;
     type EditParams = AddParams;
     type EditResult = void;
-    type RemoveParams = Pick<AddParams, 'offerId' | 'userId'>;
+    interface RemoveParams {
+        offerId: string;
+    }
     type RemoveResult = void;
 }

package/functions/regions.js

@@ -123,7 +123,8 @@ const regionByFunctions = {
     [index_1.FbFunctionName.PartnershipGroupRemove]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.OfferPublish]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.OfferEdit]: GCloudRegions.EuropeWest6,
-    [index_1.FbFunctionName.OfferEditSelection]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.OfferSelectApplicant]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.OfferViewApplicant]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.OfferOnUpdate]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.OfferCloseSelection]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.OfferRemove]: GCloudRegions.EuropeWest6,

package/helpers/collections.d.ts

@@ -31,5 +31,6 @@ export declare enum CollectionNames {
     Federation = "federation",
     FederationPartnerships = "partnerships",
     Offer = "offer",
+    OfferApplicants = "applicants",
     WebhookEvent = "webhookEvent"
 }

package/helpers/collections.js

@@ -35,5 +35,6 @@ var CollectionNames;
     CollectionNames["Federation"] = "federation";
     CollectionNames["FederationPartnerships"] = "partnerships";
     CollectionNames["Offer"] = "offer";
+    CollectionNames["OfferApplicants"] = "applicants";
     CollectionNames["WebhookEvent"] = "webhookEvent";
 })(CollectionNames = exports.CollectionNames || (exports.CollectionNames = {}));

package/models/Offer/Applicant/index.d.ts

@@ -0,0 +1,17 @@
+import Model, { DocumentModel } from '../../Model';
+import { OfferApplicantData } from './types';
+export default class OfferApplicantBasic extends Model<OfferApplicantData> {
+    constructor(doc: DocumentModel);
+    get username(): string;
+    get displayName(): string;
+    get photoURL(): string;
+    get appliedAt(): FirebaseFirestore.Timestamp;
+    get selectedAt(): FirebaseFirestore.Timestamp | null;
+    get isSelected(): boolean;
+    get discardedAt(): FirebaseFirestore.Timestamp | null;
+    get isDiscarded(): boolean;
+    get message(): string | null;
+    get viewedAt(): FirebaseFirestore.Timestamp | null;
+    get isViewed(): boolean;
+    get history(): import("./types").OfferApplicantHistory[];
+}

package/models/Offer/Applicant/{basic.js → index.js}

@@ -1,12 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-class OfferApplicantBasic {
-    constructor(offerId, data) {
-        this.offerId = offerId;
-        this.data = data;
-    }
-    get id() {
-        return this.data.id;
+const Model_1 = __importDefault(require("../../Model"));
+class OfferApplicantBasic extends Model_1.default {
+    constructor(doc) {
+        super(doc);
     }
     get username() {
         return this.data.username;
@@ -35,5 +35,14 @@ class OfferApplicantBasic {
     get message() {
         return this.data.message || null;
     }
+    get viewedAt() {
+        return this.data.viewedAt || null;
+    }
+    get isViewed() {
+        return !!this.viewedAt;
+    }
+    get history() {
+        return (this.data.history || []).sort((a, b) => a.changedAt.toMillis() - b.changedAt.toMillis());
+    }
 }
 exports.default = OfferApplicantBasic;

package/models/Offer/Applicant/types.d.ts

@@ -1,11 +1,12 @@
 import { Timestamp } from '@google-cloud/firestore';
-import { UserBasicData } from '../../User/types';
-export interface OfferApplicantBasicData extends UserBasicData {
-    appliedAt: Timestamp;
-    selectedAt: Timestamp | null;
-    discardedAt: Timestamp | null;
-    message: string | null;
+import { OfferApplicantBasicData } from '../types';
+type OfferApplicantHistoricalAction = 'viewed' | 'selected' | 'apply' | 'discard' | 'edit';
+export interface OfferApplicantHistory {
+    action: OfferApplicantHistoricalAction;
+    changedAt: Timestamp;
+    changedBy: string;
 }
-export interface AOfferApplicantBasicData extends OfferApplicantBasicData {
-    id: string;
+export interface OfferApplicantData extends OfferApplicantBasicData {
+    history: OfferApplicantHistory[];
 }
+export {};

package/models/Offer/index.d.ts

@@ -1,22 +1,29 @@
+import { DefaultInstrumentId } from '../../helpers/instruments';
 import { LanguagesTypes } from '../../lang';
 import { DocumentModel } from '../Model';
 import ModelWithLang from '../Model/lang';
-import OfferApplicantBasic from './Applicant/basic';
 import { OfferData, OfferType } from './types';
 export default class Offer extends ModelWithLang<OfferData> {
     constructor(doc: DocumentModel, lang?: LanguagesTypes);
     get createdAt(): FirebaseFirestore.Timestamp;
     get createdBy(): string;
     get title(): string;
-    get instrument(): import("../../helpers/instruments").InstrumentId;
-    get description(): string;
+    get instrument(): DefaultInstrumentId;
+    get description(): import("../../helpers/slate").Descendant[];
+    get plainDescription(): string;
     get type(): OfferType;
     get group(): string;
     get event(): string | null;
+    get locality(): string;
+    get location(): FirebaseFirestore.GeoPoint;
+    get country(): string;
     get applicantsIds(): string[];
-    get applicants(): Record<string, import("./Applicant/types").OfferApplicantBasicData>;
-    get applicantList(): OfferApplicantBasic[];
+    get applicants(): Record<string, import("./types").OfferApplicantBasicData>;
+    get applicantList(): (import("./types").OfferApplicantBasicData & {
+        id: string;
+    })[];
     get deadlineAt(): FirebaseFirestore.Timestamp | null;
+    get timezone(): string;
     get isResponseAllowed(): boolean;
     get selectionClosedAt(): FirebaseFirestore.Timestamp | null;
     get selectionClosedBy(): string | null;

package/models/Offer/index.js

@@ -7,9 +7,9 @@ const date_fns_1 = require("date-fns");
 const lodash_1 = require("lodash");
 const instruments_1 = require("../../helpers/instruments");
 const objects_1 = require("../../helpers/objects");
+const slate_1 = require("../../helpers/slate");
 const lang_1 = require("../../lang");
 const lang_2 = __importDefault(require("../Model/lang"));
-const basic_1 = __importDefault(require("./Applicant/basic"));
 const types_1 = require("./types");
 class Offer extends lang_2.default {
     constructor(doc, lang = lang_1.defaultLocale) {
@@ -30,6 +30,9 @@ class Offer extends lang_2.default {
     get description() {
         return this.data.description || '';
     }
+    get plainDescription() {
+        return (0, slate_1.serializeSlateBlock)(this.description);
+    }
     get type() {
         return this.data.type || types_1.OfferType.Group;
     }
@@ -39,6 +42,15 @@ class Offer extends lang_2.default {
     get event() {
         return this.data.event || null;
     }
+    get locality() {
+        return this.data.locality;
+    }
+    get location() {
+        return this.data.location;
+    }
+    get country() {
+        return this.data.country;
+    }
     get applicantsIds() {
         return this.data.applicantsIds || [];
     }
@@ -46,11 +58,14 @@ class Offer extends lang_2.default {
         return this.data.applicants || {};
     }
     get applicantList() {
-        return (0, objects_1.mapToArray)(this.applicants).map((data) => new basic_1.default(this.id, data));
+        return (0, objects_1.mapToArray)(this.applicants);
     }
     get deadlineAt() {
         return this.data.deadlineAt || null;
     }
+    get timezone() {
+        return this.data.timezone || 'Europe/Madrid';
+    }
     get isResponseAllowed() {
         return (!this.isSelectionClosed && (this.deadlineAt ? (0, date_fns_1.isFuture)(this.deadlineAt.toDate()) : true));
     }

package/models/Offer/types.d.ts

@@ -1,20 +1,35 @@
-import { Timestamp } from '@google-cloud/firestore';
-import { InstrumentId } from '../../helpers/instruments';
-import { OfferApplicantBasicData } from './Applicant/types';
+import { GeoPoint, Timestamp } from '@google-cloud/firestore';
+import { DefaultInstrumentId } from '../../helpers/instruments';
+import { Descendant } from '../../helpers/slate';
+import { UserBasicData } from '../User/types';
 export declare enum OfferType {
     Group = "group",
     Event = "event"
 }
+export interface OfferApplicantBasicData extends UserBasicData {
+    appliedAt: Timestamp;
+    viewedAt: Timestamp | null;
+    selectedAt: Timestamp | null;
+    discardedAt: Timestamp | null;
+    message: string | null;
+}
+export interface AOfferApplicantBasicData extends OfferApplicantBasicData {
+    id: string;
+}
 export interface OfferData {
     title: string;
-    description: string;
-    instrument: InstrumentId;
+    description: Descendant[];
+    instrument: DefaultInstrumentId;
+    locality: string;
+    location: GeoPoint;
+    country: string;
     type: OfferType;
     group: string;
     event: string | null;
     applicantsIds: string[];
     applicants: Record<string, OfferApplicantBasicData>;
     deadlineAt: Timestamp | null;
+    timezone: string;
     selectionClosedAt: Timestamp | null;
     selectionClosedBy: string | null;
     updatedAt: Timestamp;

package/models/User/index.d.ts

@@ -64,5 +64,4 @@ export default class User extends UserBasic<UserData> {
         id: string;
     })[];
     get analyticsEnabled(): true;
-    get appliedOffers(): string[];
 }

package/models/User/index.js

@@ -169,8 +169,5 @@ class User extends basic_1.default {
     get analyticsEnabled() {
         return this.data.analyticsEnabled || true;
     }
-    get appliedOffers() {
-        return this.data.appliedOffers || [];
-    }
 }
 exports.default = User;

package/models/User/types.d.ts

@@ -93,7 +93,6 @@ export interface UserData extends UserBasicData {
     registerVia: UserRegisterVia;
     lastAppLoginAt: Timestamp | null;
     lastWebLoginAt: Timestamp | null;
-    appliedOffers: string[];
 }
 export interface AUserBasicData extends UserBasicData {
     id: string;

package/package.json

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

package/models/Offer/Applicant/basic.d.ts

@@ -1,16 +0,0 @@
-import { AOfferApplicantBasicData } from './types';
-export default class OfferApplicantBasic {
-    offerId: string;
-    protected data: AOfferApplicantBasicData;
-    constructor(offerId: string, data: AOfferApplicantBasicData);
-    get id(): string;
-    get username(): string;
-    get displayName(): string;
-    get photoURL(): string;
-    get appliedAt(): FirebaseFirestore.Timestamp;
-    get selectedAt(): FirebaseFirestore.Timestamp | null;
-    get isSelected(): boolean;
-    get discardedAt(): FirebaseFirestore.Timestamp | null;
-    get isDiscarded(): boolean;
-    get message(): string | null;
-}