airbyte-faros-destination 0.10.28 → 0.10.30

package/lib/converters/bitbucket/commits.d.ts

@@ -1,9 +1,8 @@
 import { AirbyteRecord } from 'faros-airbyte-cdk';
-import { DestinationModel, DestinationRecord, StreamContext } from '../converter';
+import { DestinationModel, DestinationRecord } from '../converter';
 import { BitbucketConverter } from './common';
 export declare class Commits extends BitbucketConverter {
     readonly destinationModels: ReadonlyArray<DestinationModel>;
     id(record: AirbyteRecord): any;
     convert(record: AirbyteRecord): Promise<ReadonlyArray<DestinationRecord>>;
-    onProcessingComplete(ctx: StreamContext): Promise<ReadonlyArray<DestinationRecord>>;
 }

package/lib/converters/bitbucket/commits.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Commits = void 0;
 const faros_js_client_1 = require("faros-js-client");
-const lodash_1 = require("lodash");
 const common_1 = require("./common");
 class Commits extends common_1.BitbucketConverter {
     constructor() {
@@ -14,7 +13,7 @@ class Commits extends common_1.BitbucketConverter {
         return (_b = (_a = record === null || record === void 0 ? void 0 : record.record) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.hash;
     }
     async convert(record) {
-        var _a, _b, _c;
+        var _a, _b;
         const source = this.streamName.source;
         const commit = record.record.data;
         const res = [];
@@ -22,33 +21,23 @@ class Commits extends common_1.BitbucketConverter {
         if (!workspace || !repo) {
             return res;
         }
-        let author = null;
-        if ((_b = (_a = commit === null || commit === void 0 ? void 0 : commit.author) === null || _a === void 0 ? void 0 : _a.user) === null || _b === void 0 ? void 0 : _b.accountId) {
-            const commitUser = commit.author.user;
-            this.collectUser(commitUser, workspace);
-            author = { uid: commitUser.accountId, source };
-        }
+        const commitUser = (_a = commit === null || commit === void 0 ? void 0 : commit.author) === null || _a === void 0 ? void 0 : _a.user;
         res.push({
             model: 'vcs_Commit',
             record: {
                 sha: commit.hash,
                 uid: commit.hash,
                 message: commit.message,
-                htmlUrl: (_c = commit.links) === null || _c === void 0 ? void 0 : _c.htmlUrl,
+                htmlUrl: (_b = commit.links) === null || _b === void 0 ? void 0 : _b.htmlUrl,
                 createdAt: faros_js_client_1.Utils.toDate(commit.date),
-                author,
-                repository: {
-                    organization: { uid: (0, lodash_1.toLower)(workspace), source },
-                    uid: (0, lodash_1.toLower)(repo),
-                    name: (0, lodash_1.toLower)(repo),
-                },
+                author: (commitUser === null || commitUser === void 0 ? void 0 : commitUser.accountId)
+                    ? { uid: commitUser.accountId, source }
+                    : null,
+                repository: common_1.BitbucketCommon.vcs_Repository(workspace, repo, source),
             },
         });
         return res;
     }
-    async onProcessingComplete(ctx) {
-        return this.convertUsers();
-    }
 }
 exports.Commits = Commits;
 //# sourceMappingURL=commits.js.map

package/lib/converters/bitbucket/commits.js.map

@@ -1 +1 @@
-{"version":3,"file":"commits.js","sourceRoot":"","sources":["../../../src/converters/bitbucket/commits.ts"],"names":[],"mappings":";;;AAEA,qDAAsC;AACtC,mCAA+B;AAG/B,qCAA4C;AAE5C,MAAa,OAAQ,SAAQ,2BAAkB;IAA/C;;QACW,sBAAiB,GAAoC,CAAC,YAAY,CAAC,CAAC;IAmD/E,CAAC;IAjDC,EAAE,CAAC,MAAqB;;QACtB,OAAO,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,IAAI,0CAAE,IAAI,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,OAAO,CACX,MAAqB;;QAErB,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QACtC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAc,CAAC;QAC5C,MAAM,GAAG,GAAwB,EAAE,CAAC;QAEpC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEhE,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,EAAE,CAAC;YACxB,OAAO,GAAG,CAAC;QACb,CAAC;QAED,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,IAAI,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,IAAI,0CAAE,SAAS,EAAE,CAAC;YACpC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;YACtC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YACxC,MAAM,GAAG,EAAC,GAAG,EAAE,UAAU,CAAC,SAAS,EAAE,MAAM,EAAC,CAAC;QAC/C,CAAC;QAED,GAAG,CAAC,IAAI,CAAC;YACP,KAAK,EAAE,YAAY;YACnB,MAAM,EAAE;gBACN,GAAG,EAAE,MAAM,CAAC,IAAI;gBAChB,GAAG,EAAE,MAAM,CAAC,IAAI;gBAChB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,OAAO,EAAE,MAAA,MAAM,CAAC,KAAK,0CAAE,OAAO;gBAC9B,SAAS,EAAE,uBAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;gBACpC,MAAM;gBACN,UAAU,EAAE;oBACV,YAAY,EAAE,EAAC,GAAG,EAAE,IAAA,gBAAO,EAAC,SAAS,CAAC,EAAE,MAAM,EAAC;oBAC/C,GAAG,EAAE,IAAA,gBAAO,EAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,IAAA,gBAAO,EAAC,IAAI,CAAC;iBACpB;aACF;SACF,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,GAAkB;QAElB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;CACF;AApDD,0BAoDC"}
+{"version":3,"file":"commits.js","sourceRoot":"","sources":["../../../src/converters/bitbucket/commits.ts"],"names":[],"mappings":";;;AAEA,qDAAsC;AAGtC,qCAA6D;AAE7D,MAAa,OAAQ,SAAQ,2BAAkB;IAA/C;;QACW,sBAAiB,GAAoC,CAAC,YAAY,CAAC,CAAC;IAsC/E,CAAC;IApCC,EAAE,CAAC,MAAqB;;QACtB,OAAO,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,IAAI,0CAAE,IAAI,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,OAAO,CACX,MAAqB;;QAErB,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QACtC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAc,CAAC;QAC5C,MAAM,GAAG,GAAwB,EAAE,CAAC;QAEpC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEhE,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,EAAE,CAAC;YACxB,OAAO,GAAG,CAAC;QACb,CAAC;QAED,MAAM,UAAU,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,IAAI,CAAC;QAExC,GAAG,CAAC,IAAI,CAAC;YACP,KAAK,EAAE,YAAY;YACnB,MAAM,EAAE;gBACN,GAAG,EAAE,MAAM,CAAC,IAAI;gBAChB,GAAG,EAAE,MAAM,CAAC,IAAI;gBAChB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,OAAO,EAAE,MAAA,MAAM,CAAC,KAAK,0CAAE,OAAO;gBAC9B,SAAS,EAAE,uBAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;gBACpC,MAAM,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS;oBAC3B,CAAC,CAAC,EAAC,GAAG,EAAE,UAAU,CAAC,SAAS,EAAE,MAAM,EAAC;oBACrC,CAAC,CAAC,IAAI;gBACR,UAAU,EAAE,wBAAe,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC;aACpE;SACF,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAvCD,0BAuCC"}

package/lib/converters/bitbucket/common.d.ts

@@ -24,11 +24,19 @@ export interface ProjectKey {
     uid: string;
     source: string;
 }
+export interface RepositoryRecord {
+    uid: string;
+    name: string;
+    organization: {
+        uid: string;
+        source: string;
+    };
+}
 /** Common functions shares across Bitbucket converters */
 export declare class BitbucketCommon {
     static MAX_DESCRIPTION_LENGTH: number;
-    static vcsUser(user: PartialUser, source: string): DestinationRecord | undefined;
     static tms_ProjectBoard_with_TaskBoard(projectKey: ProjectKey, name: string, description: string | null, createdAt: string | null | undefined, updatedAt: string | null | undefined): DestinationRecord[];
+    static vcs_Repository(workspace: string, repo: string, source: string): RepositoryRecord;
 }
 /** Bitbucket converter base */
 export declare abstract class BitbucketConverter extends Converter {
@@ -39,8 +47,5 @@ export declare abstract class BitbucketConverter extends Converter {
     protected bitbucketConfig(ctx: StreamContext): BitbucketConfig;
     protected applicationMapping(ctx: StreamContext): ApplicationMapping;
     protected maxDescriptionLength(ctx: StreamContext): number;
-    protected collectUser(user: PartialUser, workspace: string): void;
-    protected convertUsers(): DestinationRecord[];
-    private getFinalUser;
 }
 export {};

package/lib/converters/bitbucket/common.js

@@ -13,25 +13,6 @@ var UserTypeCategory;
 })(UserTypeCategory || (exports.UserTypeCategory = UserTypeCategory = {}));
 /** Common functions shares across Bitbucket converters */
 class BitbucketCommon {
-    static vcsUser(user, source) {
-        var _a;
-        if (!user.accountId)
-            return undefined;
-        const userType = user.type === 'user'
-            ? { category: UserTypeCategory.USER, detail: 'user' }
-            : { category: UserTypeCategory.CUSTOM, detail: user.type };
-        return {
-            model: 'vcs_User',
-            record: {
-                uid: user.accountId,
-                name: user.displayName,
-                email: user.emailAddress,
-                type: userType,
-                htmlUrl: (_a = user.links) === null || _a === void 0 ? void 0 : _a.htmlUrl,
-                source,
-            },
-        };
-    }
     static tms_ProjectBoard_with_TaskBoard(projectKey, name, description, createdAt, updatedAt) {
         return [
             {
@@ -60,6 +41,13 @@ class BitbucketCommon {
             },
         ];
     }
+    static vcs_Repository(workspace, repo, source) {
+        return {
+            name: (0, lodash_1.toLower)(repo),
+            uid: (0, lodash_1.toLower)(repo),
+            organization: { uid: (0, lodash_1.toLower)(workspace), source },
+        };
+    }
 }
 exports.BitbucketCommon = BitbucketCommon;
 // max length for free-form description text field
@@ -88,60 +76,6 @@ class BitbucketConverter extends converter_1.Converter {
         var _a, _b;
         return ((_b = (_a = this.bitbucketConfig(ctx)) === null || _a === void 0 ? void 0 : _a.max_description_length) !== null && _b !== void 0 ? _b : BitbucketCommon.MAX_DESCRIPTION_LENGTH);
     }
-    collectUser(user, workspace) {
-        var _a;
-        if (!(user === null || user === void 0 ? void 0 : user.accountId))
-            return;
-        if (!this.collectedUsers.has(user.accountId)) {
-            this.collectedUsers.set(user.accountId, []);
-        }
-        (_a = this.collectedUsers.get(user.accountId)) === null || _a === void 0 ? void 0 : _a.push({
-            ...user,
-            workspace,
-        });
-    }
-    convertUsers() {
-        const records = [];
-        const source = this.streamName.source;
-        for (const [accountId, users] of this.collectedUsers.entries()) {
-            const emails = new Set(users.map((user) => user.emailAddress).filter((email) => !!email));
-            for (const email of emails) {
-                records.push({
-                    model: 'vcs_UserEmail',
-                    record: {
-                        user: { uid: accountId, source },
-                        email,
-                    },
-                });
-            }
-            const workspaces = new Set(users.map((user) => user.workspace).filter((org) => !(0, lodash_1.isEmpty)(org)));
-            for (const workspace of workspaces) {
-                records.push({
-                    model: 'vcs_Membership',
-                    record: {
-                        user: { uid: accountId, source },
-                        organization: { uid: (0, lodash_1.toLower)(workspace), source },
-                    },
-                });
-            }
-            const finalUser = this.getFinalUser(users);
-            records.push(BitbucketCommon.vcsUser(finalUser, source));
-        }
-        return records;
-    }
-    // Replace non-null user attributes to our copy of the user
-    // e.g. accountId, displayName, emailAddress, type, links.
-    getFinalUser(users) {
-        const finalUser = {};
-        for (const user of users) {
-            for (const key in user) {
-                if (!finalUser[key] && user[key]) {
-                    finalUser[key] = user[key];
-                }
-            }
-        }
-        return finalUser;
-    }
 }
 exports.BitbucketConverter = BitbucketConverter;
 //# sourceMappingURL=common.js.map

package/lib/converters/bitbucket/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/converters/bitbucket/common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/converters/bitbucket/common.ts"],"names":[],"mappings":";;;AAEA,qDAAsC;AACtC,mCAA+B;AAE/B,4CAKsB;AActB,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,+BAAW,CAAA;IACX,iDAA6B,CAAA;IAC7B,iCAAa,CAAA;IACb,qCAAiB,CAAA;AACnB,CAAC,EALW,gBAAgB,gCAAhB,gBAAgB,QAK3B;AAeD,0DAA0D;AAC1D,MAAa,eAAe;IAI1B,MAAM,CAAC,+BAA+B,CACpC,UAAsB,EACtB,IAAY,EACZ,WAA0B,EAC1B,SAAoC,EACpC,SAAoC;QAEpC,OAAO;YACL;gBACE,KAAK,EAAE,aAAa;gBACpB,MAAM,EAAE;oBACN,GAAG,UAAU;oBACb,IAAI,EAAE,IAAI;oBACV,WAAW,EAAE,uBAAK,CAAC,gBAAgB,CACjC,WAAW,EACX,eAAe,CAAC,sBAAsB,CACvC;oBACD,SAAS,EAAE,uBAAK,CAAC,MAAM,CAAC,SAAS,CAAC;oBAClC,SAAS,EAAE,uBAAK,CAAC,MAAM,CAAC,SAAS,CAAC;iBACnC;aACF;YACD;gBACE,KAAK,EAAE,eAAe;gBACtB,MAAM,EAAE;oBACN,GAAG,UAAU;oBACb,IAAI;iBACL;aACF;YACD;gBACE,KAAK,EAAE,kCAAkC;gBACzC,MAAM,EAAE;oBACN,KAAK,EAAE,UAAU;oBACjB,OAAO,EAAE,UAAU;iBACpB;aACF;SACF,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,cAAc,CACnB,SAAiB,EACjB,IAAY,EACZ,MAAc;QAEd,OAAO;YACL,IAAI,EAAE,IAAA,gBAAO,EAAC,IAAI,CAAC;YACnB,GAAG,EAAE,IAAA,gBAAO,EAAC,IAAI,CAAC;YAClB,YAAY,EAAE,EAAC,GAAG,EAAE,IAAA,gBAAO,EAAC,SAAS,CAAC,EAAE,MAAM,EAAC;SAChD,CAAC;IACJ,CAAC;;AApDH,0CAqDC;AApDC,kDAAkD;AAC3C,sCAAsB,GAAG,IAAI,CAAC;AAqDvC,+BAA+B;AAC/B,MAAsB,kBAAmB,SAAQ,qBAAS;IAA1D;;QACE,WAAM,GAAG,WAAW,CAAC;QAEX,mBAAc,GAAG,IAAI,GAAG,EAA8B,CAAC;IA0BnE,CAAC;IAxBC,2DAA2D;IAC3D,EAAE,CAAC,MAAqB;;QACtB,OAAO,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,IAAI,0CAAE,EAAE,CAAC;IAClC,CAAC;IAES,eAAe,CAAC,GAAkB;;QAC1C,OAAO,MAAA,MAAA,GAAG,CAAC,MAAM,0CAAE,uBAAuB,0CAAE,SAAS,CAAC;IACxD,CAAC;IAES,kBAAkB,CAAC,GAAkB;;QAC7C,OAAO,CACL,MAAA,IAAA,6BAAiB,EACf,MAAA,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,0CAAE,mBAAmB,EAC9C,qBAAqB,CACtB,mCAAI,EAAE,CACR,CAAC;IACJ,CAAC;IAES,oBAAoB,CAAC,GAAkB;;QAC/C,OAAO,CACL,MAAA,MAAA,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,0CAAE,sBAAsB,mCACjD,eAAe,CAAC,sBAAsB,CACvC,CAAC;IACJ,CAAC;CACF;AA7BD,gDA6BC"}

package/lib/converters/bitbucket/{pull_request_activities.d.ts → pull_requests_with_activities.d.ts}

@@ -2,9 +2,12 @@ import { AirbyteRecord } from 'faros-airbyte-cdk';
 import { PRActivity } from 'faros-airbyte-common/bitbucket';
 import { DestinationModel, DestinationRecord, StreamContext } from '../converter';
 import { BitbucketConverter } from './common';
-export declare class PullRequestActivities extends BitbucketConverter {
+export declare class PullRequestsWithActivities extends BitbucketConverter {
     readonly destinationModels: ReadonlyArray<DestinationModel>;
     convert(record: AirbyteRecord, ctx: StreamContext): Promise<ReadonlyArray<DestinationRecord>>;
+    private processPullRequest;
+    private toPrState;
+    private processActivity;
     reviewState(prActivity: PRActivity): {
         category: string;
         detail: string | null;

package/lib/converters/bitbucket/{pull_request_activities.js → pull_requests_with_activities.js}

@@ -1,8 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PullRequestActivities = void 0;
+exports.PullRequestsWithActivities = void 0;
 const faros_js_client_1 = require("faros-js-client");
 const common_1 = require("./common");
+var PullRequestStateCategory;
+(function (PullRequestStateCategory) {
+    PullRequestStateCategory["CLOSED"] = "Closed";
+    PullRequestStateCategory["MERGED"] = "Merged";
+    PullRequestStateCategory["OPEN"] = "Open";
+    PullRequestStateCategory["CUSTOM"] = "Custom";
+})(PullRequestStateCategory || (PullRequestStateCategory = {}));
 var PullRequestReviewStateCategory;
 (function (PullRequestReviewStateCategory) {
     PullRequestReviewStateCategory["APPROVED"] = "Approved";
@@ -11,19 +18,83 @@ var PullRequestReviewStateCategory;
     PullRequestReviewStateCategory["DISMISSED"] = "Dismissed";
     PullRequestReviewStateCategory["CUSTOM"] = "Custom";
 })(PullRequestReviewStateCategory || (PullRequestReviewStateCategory = {}));
-class PullRequestActivities extends common_1.BitbucketConverter {
+class PullRequestsWithActivities extends common_1.BitbucketConverter {
     constructor() {
         super(...arguments);
         this.destinationModels = [
-            'vcs_User',
+            'vcs_PullRequest',
             'vcs_PullRequestComment',
             'vcs_PullRequestReview',
         ];
     }
     async convert(record, ctx) {
+        const { type, pullRequest, activity } = record.record
+            .data;
+        if (type === 'PullRequest') {
+            return this.processPullRequest(pullRequest, ctx);
+        }
+        else if (type === 'PullRequestActivity') {
+            return this.processActivity(activity, ctx);
+        }
+        return [];
+    }
+    processPullRequest(pullRequest, ctx) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        const source = this.streamName.source;
+        const res = [];
+        const [workspace, repo] = (((_b = (_a = pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.source) === null || _a === void 0 ? void 0 : _a.repository) === null || _b === void 0 ? void 0 : _b.fullName) ||
+            ((_d = (_c = pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.destination) === null || _c === void 0 ? void 0 : _c.repository) === null || _d === void 0 ? void 0 : _d.fullName) ||
+            '').split('/');
+        if (!workspace || !repo)
+            return res;
+        const repoRef = common_1.BitbucketCommon.vcs_Repository(workspace, repo, source);
+        const commitHash = (_e = pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.mergeCommit) === null || _e === void 0 ? void 0 : _e.hash;
+        const mergeCommit = commitHash
+            ? { repository: repoRef, sha: commitHash, uid: commitHash }
+            : null;
+        let author = null;
+        if ((_f = pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.author) === null || _f === void 0 ? void 0 : _f.accountId) {
+            author = { uid: pullRequest.author.accountId, source };
+        }
+        res.push({
+            model: 'vcs_PullRequest',
+            record: {
+                number: pullRequest.id,
+                uid: pullRequest.id.toString(),
+                title: pullRequest.title,
+                description: faros_js_client_1.Utils.cleanAndTruncate(pullRequest.description, this.maxDescriptionLength(ctx)),
+                state: this.toPrState(pullRequest.state),
+                htmlUrl: (_g = pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.links) === null || _g === void 0 ? void 0 : _g.htmlUrl,
+                createdAt: faros_js_client_1.Utils.toDate(pullRequest.createdOn),
+                updatedAt: faros_js_client_1.Utils.toDate(pullRequest.updatedOn),
+                mergedAt: faros_js_client_1.Utils.toDate((_h = pullRequest.calculatedActivity) === null || _h === void 0 ? void 0 : _h.mergedAt),
+                commentCount: pullRequest.commentCount,
+                commitCount: (_j = pullRequest.calculatedActivity) === null || _j === void 0 ? void 0 : _j.commitCount,
+                diffStats: pullRequest.diffStat,
+                author,
+                mergeCommit,
+                repository: repoRef,
+            },
+        });
+        return res;
+    }
+    toPrState(state) {
+        const stateLower = state === null || state === void 0 ? void 0 : state.toLowerCase();
+        switch (stateLower) {
+            case 'open':
+                return { category: PullRequestStateCategory.OPEN, detail: stateLower };
+            case 'merged':
+                return { category: PullRequestStateCategory.MERGED, detail: stateLower };
+            case 'superseded':
+            case 'declined':
+                return { category: PullRequestStateCategory.CLOSED, detail: stateLower };
+            default:
+                return { category: PullRequestStateCategory.CUSTOM, detail: stateLower };
+        }
+    }
+    processActivity(prActivity, ctx) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         const source = this.streamName.source;
-        const prActivity = record.record.data;
         const res = [];
         const change = (_c = (_b = (_a = prActivity === null || prActivity === void 0 ? void 0 : prActivity.comment) !== null && _a !== void 0 ? _a : prActivity === null || prActivity === void 0 ? void 0 : prActivity.approval) !== null && _b !== void 0 ? _b : prActivity === null || prActivity === void 0 ? void 0 : prActivity.changes_requested) !== null && _c !== void 0 ? _c : prActivity === null || prActivity === void 0 ? void 0 : prActivity.update;
         const date = faros_js_client_1.Utils.toDate((_e = (_d = change === null || change === void 0 ? void 0 : change.date) !== null && _d !== void 0 ? _d : change === null || change === void 0 ? void 0 : change.updated_on) !== null && _e !== void 0 ? _e : change === null || change === void 0 ? void 0 : change.created_on);
@@ -35,15 +106,8 @@ class PullRequestActivities extends common_1.BitbucketConverter {
             ctx.logger.info(`Ignored activity for pull request ${prActivity.pullRequest.id} in repo ${prActivity.pullRequest.repositorySlug}, since it has no id: ${JSON.stringify(change)}`);
             return res;
         }
-        let reviewer = null;
         const user = (_g = change === null || change === void 0 ? void 0 : change.author) !== null && _g !== void 0 ? _g : change === null || change === void 0 ? void 0 : change.user;
-        if (user === null || user === void 0 ? void 0 : user.accountId) {
-            const userRecord = common_1.BitbucketCommon.vcsUser(user, source);
-            if (userRecord) {
-                res.push(userRecord);
-                reviewer = { uid: user.accountId, source };
-            }
-        }
+        const reviewer = (user === null || user === void 0 ? void 0 : user.accountId) ? { uid: user.accountId, source } : null;
         const orgRef = {
             uid: (_j = (_h = prActivity === null || prActivity === void 0 ? void 0 : prActivity.pullRequest) === null || _h === void 0 ? void 0 : _h.workspace) === null || _j === void 0 ? void 0 : _j.toLowerCase(),
             source,
@@ -109,5 +173,5 @@ class PullRequestActivities extends common_1.BitbucketConverter {
         return undefined;
     }
 }
-exports.PullRequestActivities = PullRequestActivities;
-//# sourceMappingURL=pull_request_activities.js.map
+exports.PullRequestsWithActivities = PullRequestsWithActivities;
+//# sourceMappingURL=pull_requests_with_activities.js.map

package/lib/converters/bitbucket/pull_requests_with_activities.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pull_requests_with_activities.js","sourceRoot":"","sources":["../../../src/converters/bitbucket/pull_requests_with_activities.ts"],"names":[],"mappings":"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"}

package/lib/converters/bitbucket/tags.d.ts

@@ -0,0 +1,7 @@
+import { AirbyteRecord } from 'faros-airbyte-cdk';
+import { DestinationModel, DestinationRecord, StreamContext } from '../converter';
+import { BitbucketConverter } from './common';
+export declare class Tags extends BitbucketConverter {
+    readonly destinationModels: ReadonlyArray<DestinationModel>;
+    convert(record: AirbyteRecord, ctx: StreamContext): Promise<ReadonlyArray<DestinationRecord>>;
+}

package/lib/converters/bitbucket/tags.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Tags = void 0;
+const common_1 = require("./common");
+class Tags extends common_1.BitbucketConverter {
+    constructor() {
+        super(...arguments);
+        this.destinationModels = ['vcs_Tag'];
+    }
+    async convert(record, ctx) {
+        var _a;
+        const source = this.streamName.source;
+        const tag = record.record.data;
+        const sha = (_a = tag.target) === null || _a === void 0 ? void 0 : _a.hash;
+        if (!sha) {
+            return [];
+        }
+        const [workspace, repo] = tag.repository.fullName.split('/');
+        if (!workspace || !repo) {
+            return [];
+        }
+        const repository = common_1.BitbucketCommon.vcs_Repository(workspace, repo, source);
+        return [
+            {
+                model: 'vcs_Tag',
+                record: {
+                    name: tag.name,
+                    message: tag.message,
+                    commit: { sha, uid: sha, repository },
+                    repository,
+                },
+            },
+        ];
+    }
+}
+exports.Tags = Tags;
+//# sourceMappingURL=tags.js.map

package/lib/converters/bitbucket/tags.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../../src/converters/bitbucket/tags.ts"],"names":[],"mappings":";;;AAIA,qCAA6D;AAE7D,MAAa,IAAK,SAAQ,2BAAkB;IAA5C;;QACW,sBAAiB,GAAoC,CAAC,SAAS,CAAC,CAAC;IAiC5E,CAAC;IA/BC,KAAK,CAAC,OAAO,CACX,MAAqB,EACrB,GAAkB;;QAElB,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QACtC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAW,CAAC;QAEtC,MAAM,GAAG,GAAG,MAAA,GAAG,CAAC,MAAM,0CAAE,IAAI,CAAC;QAC7B,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE7D,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,UAAU,GAAG,wBAAe,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3E,OAAO;YACL;gBACE,KAAK,EAAE,SAAS;gBAChB,MAAM,EAAE;oBACN,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,MAAM,EAAE,EAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,EAAC;oBACnC,UAAU;iBACX;aACF;SACF,CAAC;IACJ,CAAC;CACF;AAlCD,oBAkCC"}

package/lib/converters/bitbucket/workspace_users.d.ts

@@ -1,8 +1,7 @@
 import { AirbyteRecord } from 'faros-airbyte-cdk';
-import { DestinationModel, DestinationRecord, StreamContext } from '../converter';
+import { DestinationModel, DestinationRecord } from '../converter';
 import { BitbucketConverter } from './common';
 export declare class WorkspaceUsers extends BitbucketConverter {
     readonly destinationModels: ReadonlyArray<DestinationModel>;
     convert(record: AirbyteRecord): Promise<ReadonlyArray<DestinationRecord>>;
-    onProcessingComplete(ctx: StreamContext): Promise<ReadonlyArray<DestinationRecord>>;
 }

package/lib/converters/bitbucket/workspace_users.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkspaceUsers = void 0;
+const lodash_1 = require("lodash");
 const common_1 = require("./common");
 class WorkspaceUsers extends common_1.BitbucketConverter {
     constructor() {
@@ -11,12 +12,37 @@ class WorkspaceUsers extends common_1.BitbucketConverter {
         ];
     }
     async convert(record) {
-        const workspaceUser = record.record.data;
-        this.collectUser(workspaceUser.user, workspaceUser.workspace.slug);
-        return [];
-    }
-    async onProcessingComplete(ctx) {
-        return this.convertUsers();
+        var _a;
+        const source = this.streamName.source;
+        const { user, workspace } = record.record.data;
+        if (!(user === null || user === void 0 ? void 0 : user.accountId))
+            return [];
+        const userType = user.type === 'user'
+            ? { category: common_1.UserTypeCategory.USER, detail: 'user' }
+            : { category: common_1.UserTypeCategory.CUSTOM, detail: user.type };
+        return [
+            {
+                model: 'vcs_User',
+                record: {
+                    uid: user.accountId,
+                    name: user.displayName,
+                    email: user.emailAddress,
+                    type: userType,
+                    htmlUrl: (_a = user.links) === null || _a === void 0 ? void 0 : _a.htmlUrl,
+                    source,
+                },
+            },
+            {
+                model: 'vcs_Membership',
+                record: {
+                    user: { uid: user.accountId, source },
+                    organization: {
+                        uid: (0, lodash_1.toLower)(workspace.slug),
+                        source,
+                    },
+                },
+            },
+        ];
     }
 }
 exports.WorkspaceUsers = WorkspaceUsers;

package/lib/converters/bitbucket/workspace_users.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace_users.js","sourceRoot":"","sources":["../../../src/converters/bitbucket/workspace_users.ts"],"names":[],"mappings":";;;AAIA,qCAA4C;AAE5C,MAAa,cAAe,SAAQ,2BAAkB;IAAtD;;QACW,sBAAiB,GAAoC;YAC5D,UAAU;YACV,gBAAgB;SACjB,CAAC;IAeJ,CAAC;IAbC,KAAK,CAAC,OAAO,CACX,MAAqB;QAErB,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAqB,CAAC;QAC1D,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACnE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,GAAkB;QAElB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;CACF;AAnBD,wCAmBC"}
+{"version":3,"file":"workspace_users.js","sourceRoot":"","sources":["../../../src/converters/bitbucket/workspace_users.ts"],"names":[],"mappings":";;;AAEA,mCAA+B;AAG/B,qCAA8D;AAE9D,MAAa,cAAe,SAAQ,2BAAkB;IAAtD;;QACW,sBAAiB,GAAoC;YAC5D,UAAU;YACV,gBAAgB;SACjB,CAAC;IAuCJ,CAAC;IArCC,KAAK,CAAC,OAAO,CACX,MAAqB;;QAErB,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QACtC,MAAM,EAAC,IAAI,EAAE,SAAS,EAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAqB,CAAC;QAE9D,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,CAAA;YAAE,OAAO,EAAE,CAAC;QAEhC,MAAM,QAAQ,GACZ,IAAI,CAAC,IAAI,KAAK,MAAM;YAClB,CAAC,CAAC,EAAC,QAAQ,EAAE,yBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAC;YACnD,CAAC,CAAC,EAAC,QAAQ,EAAE,yBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAC,CAAC;QAE7D,OAAO;YACL;gBACE,KAAK,EAAE,UAAU;gBACjB,MAAM,EAAE;oBACN,GAAG,EAAE,IAAI,CAAC,SAAS;oBACnB,IAAI,EAAE,IAAI,CAAC,WAAW;oBACtB,KAAK,EAAE,IAAI,CAAC,YAAY;oBACxB,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,MAAA,IAAI,CAAC,KAAK,0CAAE,OAAO;oBAC5B,MAAM;iBACP;aACF;YACD;gBACE,KAAK,EAAE,gBAAgB;gBACvB,MAAM,EAAE;oBACN,IAAI,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,MAAM,EAAC;oBACnC,YAAY,EAAE;wBACZ,GAAG,EAAE,IAAA,gBAAO,EAAC,SAAS,CAAC,IAAI,CAAC;wBAC5B,MAAM;qBACP;iBACF;aACF;SACF,CAAC;IACJ,CAAC;CACF;AA3CD,wCA2CC"}