Skip to content

Commit e65a3e1

Browse files
authored
Merge branch 'main' into feat/eventing-handler-core
2 parents e4e5c7a + d484fa4 commit e65a3e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+5323
-74
lines changed

.github/labeler.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,10 @@
44
- head-branch: [ '^bug', '-bug-' ]
55
"Template: personalization-service":
66
- changed-files:
7-
- any-glob-to-any-file: [ 'personalization-service/**' ]
7+
- any-glob-to-any-file: [ 'personalization-service/**' ]
8+
"Component: ticketing-eai":
9+
- changed-files:
10+
- any-glob-to-any-file: [ 'ticketing-eai/**' ]
11+
"Component: ticketing-eventing":
12+
- changed-files:
13+
- any-glob-to-any-file: [ 'ticketing-eventing/**' ]

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
strategy:
5252
fail-fast: false
5353
matrix:
54-
build-path: ["./personalization-service"] # JSON array formatted as string, contains the paths to the java projects to build
54+
build-path: ["./personalization-service", "./ticketing-eventing/eventing-service"] # JSON array formatted as string, contains the paths to the java projects to build
5555
steps:
5656
- uses: it-at-m/lhm_actions/action-templates/actions/action-codeql@9767179088fd2e344d1a24c17404ab809a60f1b6 # v1.0.20
5757
if: ${{ env.analyze-java == 'true' && (github.ref_name == 'main' || needs.check-changes.outputs.java == 'true') }}

.github/workflows/maven-node-build.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@ jobs:
1616
matrix:
1717
include:
1818
- app-path: personalization-service
19+
build-image: true
1920
- app-path: personalization-webcomponents
21+
build-image: true
22+
- app-path: ticketing-eai/api-client-internal
23+
build-image: false
24+
- app-path: ticketing-eventing/eventing-service
25+
build-image: true
2026
- app-path: ticketing-eventing/handler-core
2127
build-image: false
2228

@@ -32,7 +38,7 @@ jobs:
3238
uses: it-at-m/lhm_actions/action-templates/actions/action-maven-build@9767179088fd2e344d1a24c17404ab809a60f1b6 # v1.0.20
3339
with:
3440
app-path: ${{ matrix.app-path }}
35-
- if: github.ref == 'refs/heads/main' && matrix.build-image != 'false'
41+
- if: github.ref == 'refs/heads/main' && matrix.build-image
3642
uses: it-at-m/lhm_actions/action-templates/actions/action-build-image@9767179088fd2e344d1a24c17404ab809a60f1b6 # v1.0.20
3743
with:
3844
path: ${{ matrix.app-path }}

.github/workflows/maven-release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ on:
1717
required: true
1818
options:
1919
- personalization-service
20+
- ticketing-eai/api-client-internal
21+
- ticketing-eventing/eventing-service
2022
- ticketing-eventing/handler-core
2123

2224
jobs:
@@ -41,7 +43,7 @@ jobs:
4143
GPG_PRIVATE_KEY: ${{ secrets.gpg_private_key }}
4244

4345
build-image:
44-
if: ${{ !contains('ticketing-eventing/handler-core', github.event.inputs.app-path) }}
46+
if: ${{ !contains('ticketing-eai/api-client-internal, ticketing-eventing/handler-core', github.event.inputs.app-path) }}
4547
runs-on: ubuntu-latest
4648
needs: release-maven
4749
steps:
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="DbsTicketingEventingService" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
3+
<option name="ACTIVE_PROFILES" value="local" />
4+
<module name="eventing-service" />
5+
<option name="SPRING_BOOT_MAIN_CLASS" value="de.muenchen.oss.dbs.ticketing.eventing.service.DbsTicketingEventingService" />
6+
<extension name="net.ashald.envfile">
7+
<option name="IS_ENABLED" value="false" />
8+
<option name="IS_SUBST" value="false" />
9+
<option name="IS_PATH_MACRO_SUPPORTED" value="false" />
10+
<option name="IS_IGNORE_MISSING_FILES" value="false" />
11+
<option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
12+
<ENTRIES>
13+
<ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
14+
</ENTRIES>
15+
</extension>
16+
<method v="2">
17+
<option name="Make" enabled="true" />
18+
</method>
19+
</configuration>
20+
</component>

.github/README.md renamed to README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
[documentation]: https://refarch.oss.muenchen.de/templates
77
[contribution-documentation]: https://refarch.oss.muenchen.de/contribute
88
[itm-opensource]: https://opensource.muenchen.de/
9-
[license]: ../LICENSE
10-
[code-of-conduct]: ./CODE_OF_CONDUCT.md
9+
[license]: LICENSE
10+
[code-of-conduct]: .github/CODE_OF_CONDUCT.md
1111

1212
<!-- Project specific links -->
1313
[refarch-documentation]: https://refarch.oss.muenchen.de/
@@ -29,9 +29,7 @@
2929
[![Made with love by it@M][made-with-love-shield]][itm-opensource]
3030
[![GitHub license][license-shield]][license]
3131

32-
The repository contains components for the Digital Citizen Service of the City of Munich. It currently includes the personalization service and it's corresponding webcomponents.
33-
34-
In the future, the repository will be expanded to include the other artifacts which form the Digital Citizen Service.
32+
The repository contains components for the Digital Citizen Service (German: "Digitaler Bürgerservice" DBS) of the City of Munich.
3533

3634
## Build with
3735

@@ -40,6 +38,11 @@ The project is built with technologies we use in our projects ([reference archit
4038
- [Spring][spring-documentation]
4139
- [Vue.js][vuejs-documentation]
4240

41+
## Components
42+
43+
- [personalization service](./personalization-service) and it's corresponding [webcomponents](./personalization-webcomponents)
44+
- [ticketing-eventing](./ticketing-eventing): Event notification via Zammad webhooks and Apache Kafka
45+
4346
## Getting Started
4447

4548
### personalization-service

docs/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"devDependencies": {
1616
"@muenchen/prettier-codeformat": "1.0.2",
1717
"markdownlint-cli": "0.45.0",
18-
"mermaid": "11.10.0",
18+
"mermaid": "11.10.1",
1919
"vitepress": "1.6.4",
2020
"vitepress-plugin-mermaid": "2.0.17"
2121
}

personalization-webcomponents/package-lock.json

Lines changed: 59 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)