Phabricator fixes (#539)

faros-ai · Jun 18, 2022 · 1c503d5 · 1c503d5
1 parent 11f78b0
commit 1c503d5
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/destinations/airbyte-faros-destination/src/converters/phabricator/common.ts b/destinations/airbyte-faros-destination/src/converters/phabricator/common.ts
@@ -80,7 +80,7 @@ export class PhabricatorCommon {
     const parts = message.split('\n\n');
     const revision = parts.find((p) => p.startsWith('Differential Revision:'));
     const revisionIdStr = revision
-      ? revision.split('/D').reverse()[0].trim()
+      ? revision.split('/D').reverse()[0].trim().split(/\s+/)[0]
       : undefined;
     const revisionId = Utils.parseIntegerWithDefault(revisionIdStr, -1);
 

diff --git a/destinations/airbyte-faros-destination/test/converters/phabricator.test.ts b/destinations/airbyte-faros-destination/test/converters/phabricator.test.ts
@@ -44,7 +44,7 @@ describe('phabricator', () => {
     logger.debug(stdout);
 
     const processedByStream = {
-      commits: 6,
+      commits: 7,
       projects: 4,
       repositories: 2,
       revisions: 3,
@@ -62,13 +62,13 @@ describe('phabricator', () => {
       tms_TaskBoard: 4,
       tms_TaskBoardProjectRelationship: 4,
       vcs_Branch: 2,
-      vcs_BranchCommitAssociation: 6,
-      vcs_Commit: 6,
+      vcs_BranchCommitAssociation: 7,
+      vcs_Commit: 7,
       vcs_Membership: 4,
       vcs_Organization: 2,
       vcs_PullRequest: 3,
       vcs_PullRequestReview: 3,
-      vcs_PullRequest__Update: 2,
+      vcs_PullRequest__Update: 3,
       vcs_Repository: 2,
       vcs_User: 4,
     };

diff --git a/destinations/airbyte-faros-destination/test/resources/phabricator/all-streams.log b/destinations/airbyte-faros-destination/test/resources/phabricator/all-streams.log
diff --git a/sources/phabricator-source/src/streams/commits.ts b/sources/phabricator-source/src/streams/commits.ts
@@ -23,7 +23,7 @@ export class Commits extends AirbyteStreamBase {
     return require('../../resources/schemas/commits.json');
   }
   get primaryKey(): StreamKey {
-    throw ['fields', 'identifier'];
+    return ['fields', 'identifier'];
   }
   get cursorField(): string[] {
     return ['fields', 'committer', 'epoch'];

diff --git a/sources/phabricator-source/src/streams/projects.ts b/sources/phabricator-source/src/streams/projects.ts
@@ -23,7 +23,7 @@ export class Projects extends AirbyteStreamBase {
     return require('../../resources/schemas/projects.json');
   }
   get primaryKey(): StreamKey {
-    throw 'phid';
+    return 'phid';
   }
   get cursorField(): string[] {
     return ['fields', 'dateModified'];

diff --git a/sources/phabricator-source/src/streams/repositories.ts b/sources/phabricator-source/src/streams/repositories.ts
@@ -23,7 +23,7 @@ export class Repositories extends AirbyteStreamBase {
     return require('../../resources/schemas/repositories.json');
   }
   get primaryKey(): StreamKey {
-    throw 'phid';
+    return 'phid';
   }
   get cursorField(): string[] {
     return ['fields', 'dateModified'];

diff --git a/sources/phabricator-source/src/streams/revisions.ts b/sources/phabricator-source/src/streams/revisions.ts
@@ -23,7 +23,7 @@ export class Revisions extends AirbyteStreamBase {
     return require('../../resources/schemas/revisions.json');
   }
   get primaryKey(): StreamKey {
-    throw 'phid';
+    return 'phid';
   }
   get cursorField(): string[] {
     return ['fields', 'dateModified'];

diff --git a/sources/phabricator-source/src/streams/users.ts b/sources/phabricator-source/src/streams/users.ts
@@ -23,7 +23,7 @@ export class Users extends AirbyteStreamBase {
     return require('../../resources/schemas/users.json');
   }
   get primaryKey(): StreamKey {
-    throw 'phid';
+    return 'phid';
   }
   get cursorField(): string[] {
     return ['fields', 'dateModified'];