Skip to content

Commit c1095a7

Browse files
committed
Remove CardToken, update configs, and add Oracle setup
- Updated README.md to correct Docker Compose command for Oracle DB. - Changed MYSQL_ROOT_PASSWORD in infrastructure-mysql.yml. - Removed CardToken property from OrderRequest and Order classes. - Updated ServiceBusController to remove CardToken initialization. - Reordered UseAzureKeyVault and UseLogging in Program.cs. - Removed CardToken parameter from Order initialization in SubmitOrderConsumer. - Added infrastructure-oracle.yml for Oracle DB service configuration. Remove CardToken, update DB configs, and fix README Removed CardToken property from Order-related classes and methods. Updated MySQL root password in infrastructure-mysql.yml. Added infrastructure-oracle.yml for Oracle DB setup. Corrected Oracle DB setup command in README.md. Reordered method calls in Program.cs for better configuration.
1 parent 866463f commit c1095a7

File tree

8 files changed

+41
-11
lines changed

8 files changed

+41
-11
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ docker compose -f ./infrastructure-sqlserver.yml --env-file ./.env --project-nam
8686
docker compose -f ./infrastructure-mysql.yml --env-file ./.env --project-name genocs up -d
8787

8888
# Use this file only in case you want to setup oracle database (no need if you use postgres)
89-
# docker compose -f ./infrastructure-oracle.yml --env-file ./.env --project-name genocs up -d
90-
89+
docker compose -f ./infrastructure-oracle.yml --env-file ./.env --project-name genocs up -d
9190

9291
# Use this file only in case you want to setup elk stack
9392
docker compose -f ./infrastructure-elk.yml --env-file ./.env --project-name genocs up -d

containers/infrastructure-mysql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
- 3306:3306
88

99
environment:
10-
MYSQL_ROOT_PASSWORD: example
10+
MYSQL_ROOT_PASSWORD: MySect3tPassw!
1111
volumes:
1212
- mysqlsystem:/var/lib/mysql
1313
networks:
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
services:
2+
oracledb:
3+
image: container-registry.oracle.com/database/express:21.3.0-xe
4+
hostname: oracledb
5+
container_name: oracledb
6+
ports:
7+
- 1521:1521
8+
- 5500:5500
9+
10+
environment:
11+
ORACLE_PWD: MySect3tPassw!
12+
ORACLE_CHARACTERSET: AL32UTF8
13+
ENABLE_ARCHIVELOG: true
14+
ENABLE_FORCE_LOGGING: true
15+
16+
volumes:
17+
- oracle_data:/opt/oracle/oradata
18+
- oracle_startup:/opt/oracle/scripts/startup
19+
- oracle_setup:/opt/oracle/scripts/setup
20+
21+
networks:
22+
- genocs
23+
24+
networks:
25+
genocs:
26+
name: genocs-network
27+
external: true
28+
29+
volumes:
30+
oracle_data:
31+
driver: local
32+
oracle_startup:
33+
driver: local
34+
oracle_setup:
35+
driver: local

src/Genocs.Core.Demo.Contracts/OrderRequestEvent.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ public class OrderRequest : IEvent
77
public string OrderId { get; set; } = Guid.NewGuid().ToString();
88
public string UserId { get; set; } = default!;
99
public DateTime TimeStamp { get; set; } = DateTime.UtcNow;
10-
public string CardToken { get; set; } = default!;
1110
public decimal Amount { get; set; }
1211
public string Currency { get; set; } = default!;
1312

src/Genocs.Core.Demo.Domain/Aggregates/Order.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,17 @@ namespace Genocs.Core.Demo.Domain.Aggregates;
99
[TableMapping("Orders")]
1010
public class Order : AggregateRoot<ObjectId>, IMongoDbEntity, IHasCreationTime
1111
{
12-
public Order(string orderId, string userId, string cardToken, decimal amount, string currency)
12+
public Order(string orderId, string userId, decimal amount, string currency)
1313
{
1414
OrderId = orderId;
1515
UserId = userId;
16-
CardToken = cardToken;
1716
Amount = amount;
1817
Currency = currency;
1918
}
2019

2120
public string OrderId { get; set; } = ObjectId.GenerateNewId().ToString();
2221
public string UserId { get; set; } = default!;
2322
public DateTime CreationTime { get; set; } = DateTime.UtcNow;
24-
public string CardToken { get; set; } = default!;
2523
public decimal Amount { get; set; }
2624
public string Currency { get; set; } = default!;
2725
}

src/Genocs.Core.Demo.WebApi/Controllers/ServiceBusController.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public async Task<IActionResult> PostSubmitOrder()
6060
{
6161
OrderId = Guid.NewGuid().ToString(),
6262
UserId = Guid.NewGuid().ToString(),
63-
CardToken = "6500-1254-2548",
6463
Amount = 10.0M,
6564
Currency = "EUR",
6665
Basket = new List<Product>()

src/Genocs.Core.Demo.WebApi/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
var builder = WebApplication.CreateBuilder(args);
1717

1818
builder.Host
19-
.UseLogging()
20-
.UseAzureKeyVault();
19+
.UseAzureKeyVault()
20+
.UseLogging();
2121

2222
var services = builder.Services;
2323

src/Genocs.Core.Demo.Worker/Consumers/SubmitOrderConsumer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public SubmitOrderConsumer(ILogger<SubmitOrderConsumer> logger, IMongoDbReposito
1919

2020
public async Task Consume(ConsumeContext<SubmitOrder> context)
2121
{
22-
Order order = new Order(context.Message.OrderId, context.Message.UserId, "", 1, "EUR");
22+
Order order = new Order(context.Message.OrderId, context.Message.UserId, 1, "EUR");
2323
await _orderRepository.InsertAsync(order);
2424
_logger.LogInformation($"Order {context.Message.OrderId} processed!");
2525
}

0 commit comments

Comments
 (0)