Skip to content

Commit 8d064dd

Browse files
vidakovicadamsaghy-dpcyuwatidora
committed
FINERACT-2452: New command processing - audit
Co-Authored-By: Adam Saghy <adam.saghy@dpc.hu> Co-Authored-By: Yu Wati Nyi <nyi22y@mtholyoke.edu>
1 parent 1d1876e commit 8d064dd

File tree

73 files changed

+1215
-361
lines changed

Some content is hidden

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

73 files changed

+1215
-361
lines changed

config/docker/compose/fineract.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ version: "3.8"
2121
services:
2222
fineract:
2323
# user: "${FINERACT_USER}:${FINERACT_GROUP}"
24-
image: ${IMAGE_NAME:-apache/fineract:latest}
24+
image: fineract:latest
2525
volumes:
2626
- ${PWD}/config/docker/logback/logback-override.xml:/app/logback-override.xml
2727
- ${PWD}/config/docker/aws/etc/credentials:/etc/aws/credentials:ro

config/docker/env/mariadb.env

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
MARIADB_ROOT_PASSWORD=mysql

docker-compose-community-app.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
# under the License.
1717
#
1818

19-
version: "3.8"
2019
services:
2120
# Frontend service
2221
community-app:

docker-compose-custom.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#
1818

1919
# You can replace and test a more recent version of docker compose
20-
version: "3.8"
2120
services:
2221
db:
2322
extends:

docker-compose-development.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ x-logging: &default-logging
2727
- regex:
2828
expression: '^(?P<date>\d{4}-\d{2}-\d{2}) (?P<time>\d{2}:\d{2}:\d{2}.\d{3}) (?P<message>(?s:.*))$$'
2929
30-
version: "3.8"
31-
3230
services:
3331
loki:
3432
extends:

docker-compose-mariadb.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
#
18+
19+
services:
20+
mariadb:
21+
container_name: mariadb
22+
image: mariadb:11.4
23+
volumes:
24+
- ./config/docker/mysql/conf.d/server_collation.cnf:/etc/mysql/conf.d/server_collation.cnf:ro
25+
- ./config/docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d:Z,ro
26+
restart: always
27+
env_file:
28+
- ./config/docker/env/mariadb.env
29+
healthcheck:
30+
test: [ "CMD", "healthcheck.sh", "--su-mysql", "--connect", "--innodb_initialized" ]
31+
timeout: 10s
32+
retries: 10
33+
ports:
34+
- "3306:3306"

docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
# under the License.
1717
#
1818

19-
version: "3.8"
20-
2119
services:
2220

2321
db:

fineract-cob/src/main/resources/jpa/static-weaving/module/fineract-cob/persistence.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@
6666
<class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
6767
<class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
6868

69-
<!-- Command Module Entities -->
70-
<class>org.apache.fineract.command.persistence.domain.CommandEntity</class>
71-
<class>org.apache.fineract.command.persistence.converter.JsonAttributeConverter</class>
72-
7369
<!-- Validation Module Entities -->
7470

7571
<exclude-unlisted-classes>false</exclude-unlisted-classes>

fineract-command/README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,11 @@ These different perfromance level implementations need to be absolute drop-in re
8989

9090
NOTE: we should consider providing a command processing implementation based on Apache Camel once this concept is approved and we migrated already a couple of services. They are specialized for exactly this kind of use cases and have more dedicated people working on it's implementation. Could give more flexibility without us needing to maintain code.
9191

92-
3. Middlewares
92+
3. Command Handlers
9393

9494
TBD
9595

96-
4. Command Handlers
97-
98-
TBD
99-
100-
5. References to users (aka AppUser)
96+
4. References to users (aka AppUser)
10197

10298
Keep things lightweight and only reference users by their user names.f
10399

fineract-command/REFACTORING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ Please make sure to always follow this package structure pattern:
5252
- `handler`: contains all command handlers
5353
- `service`: contains business logic services
5454
- `mapping`: contains MapStruct interfaces
55-
- `middleware`: contains middleware related to command processing; I am not expecting that we will need any of this during the refactoring process
5655
- `security`: might contain later so called Spring Security "authorization managers" for more complex use cases
5756
- `serialization`: technically we should not need this package anymore after we are done with the refactorings; in theory there could be very complex data structures that are not easily digestable by Jackson; for those case we could still use this package to add de-/serialization helpers (Jackson provides a proper API for this)
5857
- `starter`: Spring Java configuration that allows us to make Fineract customizable (make parts of the system replaceable)
@@ -237,7 +236,7 @@ Command Pipeline preserving Type Information
237236
public class DummyApiResource {
238237
...
239238
@GET
240-
DummyResponse dummy(@HeaderParam("x-fineract-request-id") UUID requestId, @HeaderParam("x-fineract-tenant-id") String tenantId, DummyRequest request) {
239+
DummyResponse dummy(@HeaderParam("x-fineract-request-id") UUID requestId, @HeaderParam("Fineract-Platform-TenantId") String tenantId, DummyRequest request) {
241240
var command = new DummyCommand();
242241
command.setId(requestId);
243242
command.setPayload(request);

0 commit comments

Comments
 (0)