Bitbucket

.editorconfig.yml

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_size = 4
+indent_style = space

README.md

@@ -44,7 +44,7 @@ keys. They are usually stored in `./var/ssh`.
 You can then declare a key to GitHub using the following command:
 
 ```
-./bin/console regis:deploy-key:add --owner=K-Phoen --repository=regis-test --public-key=./var/ssh/id_rsa_test_regis.pub
+./bin/console regis:github:add-deploy-key --owner=K-Phoen --repository=regis-test --public-key=./var/ssh/id_rsa_test_regis.pub
 ```
 
 License

app/AppKernel.php

@@ -28,8 +28,7 @@ public function registerBundles()
             new Regis\AnalysisContext\Infrastructure\Symfony\Bundle\AnalysisBundle\RegisAnalysisBundle(),
             new Regis\GithubContext\Infrastructure\Symfony\Bundle\GithubBundle\RegisGithubBundle(),
             new Regis\BitbucketContext\Infrastructure\Symfony\Bundle\BitbucketBundle\RegisBitbucketBundle(),
-
-            new Regis\Kernel\Bundle\AppBundle\RegisAppBundle(),
+            new Regis\AppContext\Infrastructure\Symfony\Bundle\AppBundle\RegisAppBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

app/Resources/db/migrations/20171102220313_create_schema.php

@@ -7,25 +7,7 @@
 class CreateSchema extends AbstractMigration
 {
     /**
-     * Change Method.
-     *
-     * Write your reversible migrations using this method.
-     *
-     * More information on writing migrations is available here:
-     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
-     *
-     * The following commands can be used in this method and Phinx will
-     * automatically reverse them when rolling back:
-     *
-     *    createTable
-     *    renameTable
-     *    addColumn
-     *    renameColumn
-     *    addIndex
-     *    addForeignKey
-     *
-     * Remember to call "create()" or "update()" and NOT "save()" when working
-     * with the Table class.
+     * {@inheritdoc}
      */
     public function change()
     {
@@ -41,11 +23,11 @@ public function change()
         $repositoriesTeams = $this->table('team_repository', ['id' => false, 'primary_key' => ['repository_id', 'team_id']]);
         $usersGithub = $this->table('user_github', ['id' => false, 'primary_key' => ['id']]);
         $usersBitbucket = $this->table('user_bitbucket', ['id' => false, 'primary_key' => ['id']]);
+        $bitbucketPrInspections = $this->table('bitbucket_pr_inspection', ['id' => false, 'primary_key' => ['id']]);
 
         $users
             ->addColumn('id', 'uuid')
-            ->addColumn('username', 'string')
-            ->addColumn('roles', 'text')
+            ->addColumn('roles', 'text', ['default' => 'ROLE_USER'])
         ;
 
         $teams
@@ -73,20 +55,25 @@ public function change()
             ->addColumn('id', 'uuid')
             ->addColumn('user_id', 'uuid')
             ->addColumn('remote_id', 'integer')
+            ->addColumn('username', 'string')
             ->addColumn('access_token', 'string')
             ->addForeignKey('user_id', 'user_account', 'id')
         ;
 
         $usersBitbucket
             ->addColumn('id', 'uuid')
             ->addColumn('user_id', 'uuid')
-            ->addColumn('remote_id', 'integer')
+            ->addColumn('remote_id', 'string')
+            ->addColumn('username', 'string')
             ->addColumn('access_token', 'string')
+            ->addColumn('refresh_token', 'string')
+            ->addColumn('access_token_expiration', 'datetime', ['timezone' => true])
             ->addForeignKey('user_id', 'user_account', 'id')
         ;
 
         $inspections
             ->addColumn('id', 'uuid')
+            ->addColumn('repository_id', 'uuid')
             ->addColumn('report_id', 'uuid', ['null' => true])
             ->addColumn('created_at', 'datetime', ['timezone' => true])
             ->addColumn('started_at', 'datetime', ['timezone' => true, 'null' => true])
@@ -97,12 +84,14 @@ public function change()
             ->addColumn('type', 'string')
             ->addColumn('failure_trace', 'text')
             ->addForeignKey('report_id', 'report', 'id')
+            ->addForeignKey('repository_id', 'repository', 'id')
         ;
 
         $repositories
             ->addColumn('id', 'uuid')
             ->addColumn('identifier', 'string')
             ->addColumn('type', 'string')
+            ->addColumn('name', 'string')
             ->addColumn('owner_id', 'uuid')
             ->addColumn('shared_secret', 'text')
             ->addColumn('is_inspection_enabled', 'boolean')
@@ -116,21 +105,29 @@ public function change()
         $githubPrInspections
             ->addColumn('id', 'uuid')
             ->addColumn('pull_request_number', 'integer')
-            ->addColumn('repository_id', 'uuid')
             ->addForeignKey('id', 'inspection', 'id')
-            ->addForeignKey('repository_id', 'repository', 'id')
+        ;
+
+        $bitbucketPrInspections
+            ->addColumn('id', 'uuid')
+            ->addColumn('pull_request_number', 'integer')
+            ->addForeignKey('id', 'inspection', 'id')
         ;
 
         $reports
             ->addColumn('id', 'uuid')
             ->addColumn('status', 'string')
+            ->addColumn('errors_count', 'integer', ['default' => 0])
+            ->addColumn('warnings_count', 'integer', ['default' => 0])
             ->addColumn('raw_diff', 'text')
         ;
 
         $analyses
             ->addColumn('id', 'uuid')
             ->addColumn('report_id', 'uuid')
             ->addColumn('type', 'text')
+            ->addColumn('errors_count', 'integer', ['default' => 0])
+            ->addColumn('warnings_count', 'integer', ['default' => 0])
             ->addForeignKey('report_id', 'report', 'id')
         ;
 
@@ -155,6 +152,7 @@ public function change()
         $reports->create();
         $inspections->create();
         $githubPrInspections->create();
+        $bitbucketPrInspections->create();
         $analyses->create();
         $violations->create();
     }

app/Resources/db/seeds/Seed01User.php

@@ -14,7 +14,6 @@ public function run()
         $users->insert([
             [
                 'id' => 'd67ff369-704b-4315-a75f-b67f5bc9cc5a',
-                'username' => 'K-Phoen',
                 'roles' => 'ROLE_USER',
             ],
         ]);
@@ -23,6 +22,7 @@ public function run()
             [
                 'id' => 'bf323fb5-2661-4bc7-bc32-0385b05017be',
                 'user_id' => 'd67ff369-704b-4315-a75f-b67f5bc9cc5a',
+                'username' => 'K-Phoen',
                 'remote_id' => 42,
                 'access_token' => 'fake access token',
             ],

app/Resources/db/seeds/Seed20Repository.php

@@ -15,6 +15,7 @@ public function run()
                 'id' => 'f733e45a-6fc7-404b-879d-656d68e0498d',
                 'identifier' => 'K-Phoen/regis',
                 'type' => 'github',
+                'name' => 'K-Phoen/regis',
                 'owner_id' => 'd67ff369-704b-4315-a75f-b67f5bc9cc5a',
                 'shared_secret' => 'some-shared-secret',
                 'is_inspection_enabled' => true,

app/Resources/db/seeds/Seed30Inspection.php

@@ -14,6 +14,7 @@ public function run()
         $inspections->insert([
             [
                 'id' => 'fca728fc-9be0-40a1-a7d3-94f3fe4e118a',
+                'repository_id' => 'f733e45a-6fc7-404b-879d-656d68e0498d',
                 'report_id' => null,
                 'created_at' => '2017-11-08 21:36:00',
                 'started_at' => null,
@@ -30,7 +31,6 @@ public function run()
             [
                 'id' => 'f733e45a-6fc7-404b-879d-656d68e0498d',
                 'pull_request_number' => 14,
-                'repository_id' => '2017-11-08 21:36:00',
             ],
         ]);
 

app/Resources/views/utils.html.twig

@@ -10,7 +10,7 @@
 
 {% macro inspection_type(inspection) %}
     {% spaceless %}
-    {% if inspection.type == 'github_pr' %}
+    {% if inspection.type == 'github_pr' or inspection.type == 'bitbucket_pr' %}
         PR
     {% else %}
         Unknown ({{ inspection.type }})
@@ -65,9 +65,11 @@
 {% macro repository_type(repo) %}
     {% spaceless %}
         {% if repo.type == 'github' %}
-            GitHub
+            Github
+        {% elseif repo.type == 'bitbucket' %}
+            Bitbucket
         {% else %}
             Unknown ({{ repo.type }})
         {% endif %}
     {% endspaceless %}
-{% endmacro %}
+{% endmacro %}

app/config/bundles/knpu_oauth2_client.yml

@@ -10,4 +10,4 @@ knpu_oauth2_client:
             type: bitbucket
             client_id: '%bitbucket_client_id%'
             client_secret: '%bitbucket_client_secret%'
-            redirect_route: github_connect_check
+            redirect_route: bitbucket_connect_check

app/config/bundles/old_sound_rabbit_mq.yml

@@ -43,3 +43,12 @@ old_sound_rabbit_mq:
                 routing_keys: [ analysis.github_pr.status ]
             callback: regis.github.worker.analysis_status
             enable_logger: true
+
+        bitbucket_analysis_status:
+            connection: default
+            exchange_options: {name: 'analysis-status', type: direct}
+            queue_options:
+                name: 'bitbucket-analysis-status'
+                routing_keys: [ analysis.bitbucket_pr.status ]
+            callback: regis.bitbucket.worker.analysis_status
+            enable_logger: true

app/config/bundles/tactician.yml

@@ -9,7 +9,7 @@ services:
             - { name: monolog.logger, channel: command_bus }
 
     regis.tactician.middleware.security:
-        class: Regis\GithubContext\Application\CommandHandler\Middleware\Security
+        class: Regis\AppContext\Application\CommandHandler\Middleware\Security
         arguments: [ '@rulerz', '@regis.security.context' ]
         tags:
             - { name: monolog.logger, channel: command_bus }

app/config/config.yml

@@ -72,6 +72,18 @@ doctrine:
                 dir: '%kernel.root_dir%/../src/AnalysisContext/Domain/Entity/config'
                 prefix: Regis\AnalysisContext\Domain\Entity
                 alias: RegisAnalysisContext
+            Regis\AppContext:
+                type: yml
+                is_bundle: false
+                dir: '%kernel.root_dir%/../src/AppContext/Domain/Entity/config'
+                prefix: Regis\AppContext\Domain\Entity
+                alias: RegisAppContext
+            Regis\BitbucketContext:
+                type: yml
+                is_bundle: false
+                dir: '%kernel.root_dir%/../src/BitbucketContext/Domain/Entity/config'
+                prefix: Regis\BitbucketContext\Domain\Entity
+                alias: RegisBitbucketContext
             Regis\GithubContext:
                 type: yml
                 is_bundle: false

app/config/security.yml

@@ -4,19 +4,13 @@ security:
 
     # http://symfony.com/doc/current/book/security.html#where-do-users-come-from-user-providers
     providers:
-        regis_db_provider:
-            entity:
-                class: Regis\GithubContext\Domain\Entity\User
-                property: username
+        regis_user_provider:
+            id: regis.app.user_account_provider
 
     role_hierarchy:
         ROLE_ADMIN: ROLE_USER
         ROLE_SUPER_ADMIN: [ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH]
 
-
-    encoders:
-          Regis\Domain\Entity\User: bcrypt
-
     firewalls:
         # disables authentication for assets and the profiler, adapt it according to your needs
         dev:
@@ -29,7 +23,7 @@ security:
 
         main:
             pattern: ^/
-            provider: regis_db_provider
+            provider: regis_user_provider
             switch_user: true
             anonymous: ~
             remember_me:

composer.json

@@ -44,6 +44,7 @@
 
         "php-http/guzzle6-adapter": "^1.1",
         "knplabs/github-api": "^2.6",
+        "gentle/bitbucket-api": "^1.1",
         "gitonomy/gitlib": "^1.0",
 
         "php-amqplib/rabbitmq-bundle": "^1.10",