Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into feature/CONNEC…
Browse files Browse the repository at this point in the history
…TOR-50/endpoints-object
  • Loading branch information
rubenvdlinde committed Dec 7, 2024
2 parents 3fe8ad1 + 8027d22 commit 89435d5
Show file tree
Hide file tree
Showing 200 changed files with 15,172 additions and 2,560 deletions.
8 changes: 8 additions & 0 deletions .cursorrules
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- add docblocks to all methods, classes, and properties
- add return types to all methods
- add type hints to all methods
- add default values to all methods
- add phpstan and psalm annotations to all methods
- add phpunit tests to all methods
- add inline comments to all logic explaining the steps being taken
- use readonly properties where appropriate
18 changes: 18 additions & 0 deletions .github/workflows/pull-request-from-branch-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Main Branch Protection

#on:
# pull_request:
# branches:
# - main

#jobs:
# check-branch:
# runs-on: ubuntu-latest
# steps:
# - name: Check branch
# run: |
# if [[ ${GITHUB_HEAD_REF} != development ]] && [[ ${GITHUB_HEAD_REF} != documentation ]] && ! [[ ${GITHUB_HEAD_REF} =~ ^hotfix/ ]];
# then
# echo "Error: Pull request must come from 'development', 'documentation' or 'hotfix/' branch"
# exit 1
# fi
21 changes: 21 additions & 0 deletions .github/workflows/pull-request-lint-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Lint Check

on:
pull_request:
branches:
- development
- main

jobs:
lint-check:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Install dependencies
run: npm i

- name: Linting
run: npm run lint
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# OpenConector

Provides gateway and service bus functionality like mapping, translation and synchronisation of data

15 changes: 12 additions & 3 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
The OpenConnector Nextcloud app provides a ESB-framework to work together in an (open) data ecosystem
- 📲 Synchronize your data sources
- 📲 Synchronize your data sources
- 📰 Send cloud events
- 🆓 Map and translate API calls
]]></description>
<version>0.1.11</version>
<version>0.1.26</version>
<licence>agpl</licence>
<category>integration</category>
<author mail="[email protected]" homepage="https://www.conduction.nl/">Conduction</author>
Expand All @@ -27,12 +27,16 @@ The OpenConnector Nextcloud app provides a ESB-framework to work together in an
<database min-version="10">pgsql</database>
<database>sqlite</database>
<database min-version="8.0">mysql</database>

<lib>curl</lib>

<owncloud max-version="0" min-version="0"/>
</dependencies>

<background-jobs>
<job>OCA\OpenConnector\Cron\LogCleanUpTask</job>
</background-jobs>

<navigations>
<navigation>
<id>openconnector</id>
Expand All @@ -41,4 +45,9 @@ The OpenConnector Nextcloud app provides a ESB-framework to work together in an
<icon>app.svg</icon>
</navigation>
</navigations>

<settings>
<admin>OCA\OpenConnector\Settings\OpenConnectorAdmin</admin>
<admin-section>OCA\OpenConnector\Sections\OpenConnectorAdmin</admin-section>
</settings>
</info>
16 changes: 16 additions & 0 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,28 @@
'Mappings' => ['url' => 'api/mappings'],
'Jobs' => ['url' => 'api/jobs'],
'Synchronizations' => ['url' => 'api/synchronizations'],
'Endpoints' => ['url' => 'api/endpoints'],
'Consumers' => ['url' => 'api/consumers'],
],
'routes' => [
['name' => 'dashboard#page', 'url' => '/', 'verb' => 'GET'],
['name' => 'sources#test', 'url' => '/api/source-test/{id}', 'verb' => 'POST'],
['name' => 'sources#logs', 'url' => '/api/sources-logs/{id}', 'verb' => 'GET'],
['name' => 'jobs#run', 'url' => '/api/jobs-test/{id}', 'verb' => 'POST'],
['name' => 'jobs#logs', 'url' => '/api/jobs-logs/{id}', 'verb' => 'GET'],
['name' => 'endpoints#test', 'url' => '/api/endpoints-test/{id}', 'verb' => 'POST'],
['name' => 'endpoints#logs', 'url' => '/api/endpoints-logs/{id}', 'verb' => 'GET'],
['name' => 'synchronizations#contracts', 'url' => '/api/synchronizations-contracts/{id}', 'verb' => 'GET'],
['name' => 'synchronizations#logs', 'url' => '/api/synchronizations-logs/{id}', 'verb' => 'GET'],
['name' => 'synchronizations#test', 'url' => '/api/synchronizations-test/{id}', 'verb' => 'POST'],
// Mapping endpoints
['name' => 'mappings#test', 'url' => '/api/mappings/test', 'verb' => 'POST'],
['name' => 'mappings#saveObject', 'url' => '/api/mappings/objects', 'verb' => 'POST'],
['name' => 'mappings#getObjects', 'url' => '/api/mappings/objects', 'verb' => 'GET'],
// Running endpoints
['name' => 'endpoints#run', 'url' => '/api/v1/{endpoint}', 'verb' => 'GET'],
['name' => 'endpoints#run', 'url' => '/api/v1/{endpoint}', 'verb' => 'PUT'],
['name' => 'endpoints#run', 'url' => '/api/v1/{endpoint}', 'verb' => 'POST'],
['name' => 'endpoints#run', 'url' => '/api/v1/{endpoint}', 'verb' => 'DELETE'],
],
];
6 changes: 5 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,12 @@
"bamarni/composer-bin-plugin": "^1.8",
"elasticsearch/elasticsearch": "^v8.14.0",
"guzzlehttp/guzzle": "^7.0",
"jwadhams/json-logic-php": "^1.5",
"symfony/console": "^5.4",
"symfony/uid": "^6.4",
"twig/twig": "^3.14"
"symfony/yaml": "^6.4",
"twig/twig": "^3.14",
"web-token/jwt-framework": "^3"
},
"require-dev": {
"nextcloud/ocp": "dev-stable29",
Expand Down
Loading

0 comments on commit 89435d5

Please sign in to comment.