Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/integration solution changes #1135

Merged
merged 11 commits into from
Nov 17, 2023
Merged

Feature/integration solution changes #1135

merged 11 commits into from
Nov 17, 2023

Conversation

jan-schutte
Copy link
Collaborator

No description provided.

@jan-schutte
- added Solution changes for Integration
4440777
@jan-schutte
Merge remote-tracking branch 'origin/main' into feature/integration-s…
c57639b 
…olution-changes

# Conflicts:
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/BankNoteCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/BankNoteDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/BankNoteUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/BookingCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/BookingDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/BookingUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CashStockOrderCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CashStockOrderDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CashStockOrderUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CommissionCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CommissionDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CommissionUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CountryCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CountryDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CountryTimeZoneCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CountryTimeZoneDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CountryTimeZoneUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CountryUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CurrencyCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CurrencyDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CurrencyUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CustomerCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CustomerDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/CustomerUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/EmployeeCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/EmployeeDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/EmployeePhoneNumberCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/EmployeePhoneNumberDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/EmployeePhoneNumberUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/EmployeeUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/ExchangeRateCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/ExchangeRateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/ExchangeRateUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/HolidayCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/HolidayDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/HolidayUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/LandLordCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/LandLordDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/LandLordUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/MinimumCashStockCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/MinimumCashStockDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/MinimumCashStockUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/PaymentDetailCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/PaymentDetailDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/PaymentDetailUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/PaymentProviderCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/PaymentProviderDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/PaymentProviderUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/TransactionCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/TransactionDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/TransactionUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/VendingMachineCreateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/VendingMachineDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Application.Dto/VendingMachineUpdateDto.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/BankNote.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/Booking.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/CashStockOrder.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/Commission.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/Country.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/CountryTimeZone.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/Currency.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/Customer.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/Employee.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/EmployeePhoneNumber.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/ExchangeRate.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/Holiday.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/LandLord.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/MinimumCashStock.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/PaymentDetail.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/PaymentProvider.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/Transaction.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Domain/VendingMachine.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/BookingsController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/BookingsController/Entity.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/CashStockOrdersController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/CashStockOrdersController/Entity.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/CommissionsController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/CommissionsController/Entity.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/CountriesController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/CountriesController/Entity.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/CurrenciesController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/CurrenciesController/Entity.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/CustomersController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/CustomersController/Entity.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/EmployeesController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/EmployeesController/Entity.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/LandLordsController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/LandLordsController/Entity.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/MinimumCashStocksController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/MinimumCashStocksController/Entity.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/ODataServiceCollectionExtensions.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/PaymentDetailsController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/PaymentDetailsController/Entity.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/PaymentProvidersController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/PaymentProvidersController/Entity.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/TransactionsController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/TransactionsController/Entity.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/VendingMachinesController.g.cs
#	samples/Cryptocash.Api/Generated/Nox.Generator/Nox.Generator.NoxCodeGenerator/Presentation.Api.OData/VendingMachinesController/Entity.g.cs
#	samples/Cryptocash.Ui/Nox.Generated/Generator.g.cs
#	src/Nox.Generator.sln
#	src/Nox.Integration.Tests/Nox.Integration.Tests.csproj
#	src/Nox.Solution/Models/Application/Integrations/Source/IntegrationSourceWatermark.cs
#	src/Nox.Solution/ValidationResources.Designer.cs
@jan-schutte
- re-organized solution for integration schema changes
85d78b9 
- fixed failing tests
@rochar
Copy link
Collaborator

rochar commented Nov 17, 2023

@jan-schutte your PR has 1375 files changes, I guess you have commited some generated files that were deleted on build, can y see this first?

Also can you Move Nox.Integration.Tests to folder ./tests?

rochar
rochar requested changes Nov 17, 2023
View reviewed changes
Copy link
Collaborator

@rochar rochar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see my comment please
thks

@jan-schutte
Copy link
Collaborator Author

Hi @rochar I've fixed the files as requested

rochar
rochar requested changes Nov 17, 2023
View reviewed changes
Copy link
Collaborator

@rochar rochar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you move Nox.Integration.Tests to ./tests

src/Nox.Solution/Enums/Application/Integration/IntegrationSourceAdapterType.cs
@@ -0,0 +1,10 @@
namespace Nox;

public enum IntegrationSourceAdapterType
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest just to add the adapter that we are supporting at the moment
and comment the other ones
to avoid creating wrong expectations
and to be clear what we are supporting at the moment

for now is DatabaseQuery only?

src/Nox.Solution/Enums/Application/Integration/IntegrationTargetAdapterType.cs
@@ -0,0 +1,11 @@
namespace Nox;

public enum IntegrationTargetAdapterType
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment here!

...Solution/Validation/Application/Integration/Target/IntegrationTargetTableOptionsValidator.cs Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will probably conflict with what Andre is doing, maybe we can not commit this now and integrate validation when Nox.Yaml is fully integrated

rochar
rochar previously approved these changes Nov 17, 2023
View reviewed changes
@jan-schutte
- added back EtlTEsts
2c3c15a 
- commented out not-implemented integration adapter types
@jan-schutte jan-schutte merged commit 3b9ca7e into main Nov 17, 2023
1 check passed
@jan-schutte jan-schutte deleted the feature/integration-solution-changes branch November 17, 2023 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rochar rochar rochar left review comments

@AndreyDegtyarev AndreyDegtyarev Awaiting requested review from AndreyDegtyarev

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jan-schutte @rochar