diff --git a/SqlSchemaCompare_Dev_to_DevRelease.scmp b/SqlSchemaCompare_Dev_to_DevRelease.scmp new file mode 100644 index 00000000..05443017 --- /dev/null +++ b/SqlSchemaCompare_Dev_to_DevRelease.scmp @@ -0,0 +1,1029 @@ + + + 10 + + + Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Persist Security Info=True;User ID=Anata_Development_Team;Pooling=False;Multiple Active Result Sets=False;Connect Timeout=60;Encrypt=True;Trust Server Certificate=True;Command Timeout=0 + + + + + Data Source=185.51.190.197;Initial Catalog=TIAM_DEVRELEASE;Persist Security Info=True;User ID=Anata_Development_Team;Pooling=False;Multiple Active Result Sets=False;Connect Timeout=60;Encrypt=True;Trust Server Certificate=True;Command Timeout=0 + + + + + + Version + 1 + + + + + PlanGenerationType + SqlDeploymentOptions + + + AllowExistingModelErrors + False + + + AllowIncompatiblePlatform + False + + + AllowTableRecreation + True + + + BackupDatabaseBeforeChanges + False + + + IgnoreIndexesStatisticsOnEnclaveEnabledColumns + False + + + BlockOnPossibleDataLoss + True + + + BlockWhenDriftDetected + False + + + CompareUsingTargetCollation + False + + + CommentOutSetVarDeclarations + False + + + CreateNewDatabase + False + + + DeployDatabaseInSingleUserMode + False + + + DisableAndReenableDdlTriggers + True + + + DisableIndexesForDataPhase + True + + + DisableParallelismForEnablingIndexes + False + + + DoNotAlterChangeDataCaptureObjects + True + + + DoNotAlterReplicatedObjects + True + + + DropConstraintsNotInSource + True + + + DropDmlTriggersNotInSource + True + + + DropExtendedPropertiesNotInSource + True + + + DropIndexesNotInSource + True + + + DropPermissionsNotInSource + False + + + DropObjectsNotInSource + True + + + DropRoleMembersNotInSource + False + + + DropStatisticsNotInSource + True + + + GenerateSmartDefaults + False + + + HashObjectNamesInLogs + False + + + IgnoreDdlTriggerOrder + False + + + IgnoreDdlTriggerState + False + + + IgnoreObjectPlacementOnPartitionScheme + True + + + IgnoreAuthorizer + False + + + IgnoreDefaultSchema + False + + + IgnoreRouteLifetime + True + + + IgnoreCryptographicProviderFilePath + True + + + IgnoreComments + False + + + IgnoreWhitespace + True + + + IgnoreKeywordCasing + True + + + IgnoreSemicolonBetweenStatements + True + + + IgnorePartitionSchemes + False + + + IgnoreTablePartitionOptions + False + + + IgnoreWithNocheckOnCheckConstraints + False + + + IgnoreWithNocheckOnForeignKeys + False + + + IgnoreIdentitySeed + False + + + IgnoreIncrement + False + + + IgnoreFillFactor + True + + + IgnoreIndexPadding + True + + + IgnoreColumnCollation + False + + + IgnoreColumnOrder + False + + + IgnoreLockHintsOnIndexes + False + + + IgnoreTableOptions + False + + + IgnoreIndexOptions + False + + + IgnoreDmlTriggerOrder + False + + + IgnoreDmlTriggerState + False + + + IgnoreAnsiNulls + True + + + IgnoreQuotedIdentifiers + True + + + IgnoreUserSettingsObjects + False + + + IgnoreFilegroupPlacement + True + + + IgnoreFullTextCatalogFilePath + True + + + IgnoreFileAndLogFilePath + True + + + IgnoreLoginSids + True + + + IgnoreNotForReplication + False + + + IgnoreFileSize + True + + + IgnoreSensitivityClassifications + False + + + AllowUnsafeRowLevelSecurityDataMovement + False + + + IncludeCompositeObjects + False + + + IncludeTransactionalScripts + False + + + IsAlwaysEncryptedParameterizationEnabled + False + + + NoAlterStatementsToChangeCLRTypes + False + + + PopulateFilesOnFileGroups + True + + + PreserveIdentityLastValues + False + + + RegisterDataTierApplication + False + + + PerformIndexOperationsOnline + False + + + RebuildIndexesOfflineForDataPhase + False + + + RestoreSequenceCurrentValue + True + + + ScriptDatabaseCollation + False + + + ScriptDatabaseCompatibility + False + + + ScriptDatabaseOptions + False + + + ScriptDeployStateChecks + False + + + ScriptFileSize + False + + + ScriptNewConstraintValidation + True + + + ScriptRefreshModule + True + + + TargetDatabaseName + TIAM_PROD + + + TargetConnectionString + Data Source=185.51.190.197;Initial Catalog=TIAM_PROD;Persist Security Info=True;User ID=Anata_Development_Team;Pooling=False;Multiple Active Result Sets=False;Connect Timeout=60;Encrypt=True;Trust Server Certificate=True;Application Name="Microsoft SQL Server Data Tools, Schema Compare";Command Timeout=0 + + + TreatVerificationErrorsAsWarnings + False + + + UnmodifiableObjectWarnings + True + + + VerifyCollationCompatibility + True + + + VerifyDeployment + True + + + RunDeploymentPlanExecutors + False + + + AllowDropBlockingAssemblies + False + + + DoNotEvaluateSqlCmdVariables + True + + + DoNotDropAggregates + False + + + DoNotDropApplicationRoles + False + + + DoNotDropAssemblies + False + + + DoNotDropAsymmetricKeys + False + + + DoNotDropAudits + False + + + DoNotDropBrokerPriorities + False + + + DoNotDropCertificates + False + + + DoNotDropClrUserDefinedTypes + False + + + DoNotDropColumnEncryptionKeys + False + + + DoNotDropColumnMasterKeys + False + + + DoNotDropContracts + False + + + DoNotDropCredentials + False + + + DoNotDropDatabaseScopedCredentials + False + + + DoNotDropCryptographicProviders + False + + + DoNotDropDatabaseAuditSpecifications + False + + + DoNotDropDatabaseRoles + False + + + DoNotDropDatabaseTriggers + False + + + IgnoreDatabaseWorkloadGroups + False + + + DoNotDropDatabaseWorkloadGroups + False + + + IgnoreWorkloadClassifiers + False + + + DoNotDropWorkloadClassifiers + False + + + DoNotDropDefaults + False + + + DoNotDropEndpoints + False + + + DoNotDropErrorMessages + False + + + DoNotDropEventNotifications + False + + + DoNotDropEventSessions + False + + + DoNotDropExtendedProperties + False + + + DoNotDropExternalDataSources + False + + + DoNotDropExternalFileFormats + False + + + DoNotDropExternalLanguages + False + + + DoNotDropExternalLibraries + False + + + DoNotDropExternalStreamingJobs + False + + + DoNotDropExternalTables + False + + + DoNotDropExternalStreams + False + + + DoNotDropFilegroups + False + + + DoNotDropFiles + False + + + DoNotDropFileTables + False + + + DoNotDropFullTextCatalogs + False + + + DoNotDropFullTextStoplists + False + + + DoNotDropTableValuedFunctions + False + + + DoNotDropLinkedServerLogins + False + + + DoNotDropLinkedServers + False + + + DoNotDropLogins + False + + + DoNotDropMessageTypes + False + + + DoNotDropPartitionFunctions + False + + + DoNotDropPartitionSchemes + False + + + DoNotDropPermissions + False + + + DoNotDropQueues + False + + + DoNotDropRemoteServiceBindings + False + + + DoNotDropRoleMembership + False + + + DoNotDropRoutes + False + + + DoNotDropRules + False + + + DoNotDropScalarValuedFunctions + False + + + DoNotDropSearchPropertyLists + False + + + DoNotDropSecurityPolicies + False + + + DoNotDropSequences + False + + + DoNotDropServerAuditSpecifications + False + + + DoNotDropServerRoleMembership + False + + + DoNotDropServerRoles + False + + + DoNotDropServerTriggers + False + + + DoNotDropServices + False + + + DoNotDropSignatures + False + + + DoNotDropStoredProcedures + False + + + DoNotDropSymmetricKeys + False + + + DoNotDropSynonyms + False + + + DoNotDropTables + False + + + DoNotDropUserDefinedDataTypes + False + + + DoNotDropUserDefinedTableTypes + False + + + DoNotDropUsers + False + + + DoNotDropViews + False + + + DoNotDropXmlSchemaCollections + False + + + ExcludeAggregates + False + + + ExcludeApplicationRoles + False + + + ExcludeAssemblies + False + + + ExcludeAsymmetricKeys + False + + + ExcludeAudits + True + + + ExcludeBrokerPriorities + False + + + ExcludeCertificates + False + + + ExcludeClrUserDefinedTypes + False + + + ExcludeColumnEncryptionKeys + False + + + ExcludeColumnMasterKeys + False + + + ExcludeContracts + False + + + ExcludeCredentials + True + + + ExcludeDatabaseScopedCredentials + True + + + ExcludeCryptographicProviders + True + + + ExcludeDatabaseAuditSpecifications + True + + + ExcludeDatabaseRoles + False + + + ExcludeDatabaseTriggers + False + + + ExcludeDefaults + False + + + ExcludeEndpoints + True + + + ExcludeErrorMessages + True + + + ExcludeEventNotifications + False + + + ExcludeExternalDataSources + False + + + ExcludeExternalFileFormats + False + + + ExcludeExternalLanguages + False + + + ExcludeExternalLibraries + False + + + ExcludeExternalStreamingJobs + False + + + ExcludeExternalTables + False + + + ExcludeExternalStreams + False + + + ExcludeEventSessions + True + + + ExcludeFilegroups + False + + + ExcludeFiles + True + + + ExcludeFileTables + False + + + ExcludeFullTextCatalogs + False + + + ExcludeFullTextStoplists + False + + + ExcludeTableValuedFunctions + False + + + ExcludeLinkedServerLogins + True + + + ExcludeLinkedServers + True + + + ExcludeLogins + True + + + ExcludeMessageTypes + False + + + ExcludePartitionFunctions + False + + + ExcludePartitionSchemes + False + + + ExcludeQueues + False + + + ExcludeRemoteServiceBindings + False + + + ExcludeRoutes + True + + + ExcludeRules + False + + + ExcludeScalarValuedFunctions + False + + + ExcludeSearchPropertyLists + False + + + ExcludeSecurityPolicies + False + + + ExcludeSequences + False + + + ExcludeServerAuditSpecifications + True + + + ExcludeServerRoleMembership + True + + + ExcludeServerRoles + True + + + ExcludeServerTriggers + True + + + ExcludeServices + False + + + ExcludeSignatures + False + + + ExcludeStoredProcedures + False + + + ExcludeSymmetricKeys + False + + + ExcludeSynonyms + False + + + ExcludeTables + False + + + ExcludeUserDefinedDataTypes + False + + + ExcludeUserDefinedTableTypes + False + + + ExcludeUsers + False + + + ExcludeViews + False + + + ExcludeXmlSchemaCollections + False + + + AllowExternalLibraryPaths + False + + + AllowExternalLanguagePaths + False + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlServerDdlTrigger + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlRoute + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlLinkedServerLogin + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlEndpoint + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlErrorMessage + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlFile + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlLogin + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlLinkedServer + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlCredential + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseCredential + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseEncryptionKey + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlMasterKey + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseAuditSpecification + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlServerAudit + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlServerAuditSpecification + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlCryptographicProvider + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlUserDefinedServerRole + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlEventSession + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseOptions + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlEventNotification + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlServerRoleMembership + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseEventSession + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlAssemblyFile + ExcludedType + + + + + 2 + 100 + Equals_Objects,Not_Supported_Deploy + + \ No newline at end of file diff --git a/TIAM.Database.Test/AdminDalTest.cs b/TIAM.Database.Test/AdminDalTest.cs index 988e77bf..b1ad300e 100644 --- a/TIAM.Database.Test/AdminDalTest.cs +++ b/TIAM.Database.Test/AdminDalTest.cs @@ -13,6 +13,7 @@ using TIAM.Entities.Products; using TIAM.Entities.Users; using TIAM.Models.Dtos.Users; using TIAM.Entities.Transfers; +using TIAM.Entities.Profiles; namespace TIAM.Database.Test { @@ -32,9 +33,9 @@ namespace TIAM.Database.Test [DataRow("42968456-6EF3-4D9C-8BC4-0569A129AC05")] public void GetPermissionViewBySubjectId_ReturnsPermissionContextMapping_WhenPermissionContextMappingExists(string subjectIdString) { - var subjectId= Guid.Parse(subjectIdString); + var subjectId = Guid.Parse(subjectIdString); var permMapping = Dal.GetPermissionContextsViewBySubjectId(subjectId).ToList(); - + Assert.IsNotNull(permMapping, "PermissionContextsView is null"); Assert.IsTrue(permMapping.Count != 0, "PermissionContextsView count: 0"); } @@ -45,7 +46,7 @@ namespace TIAM.Database.Test { var contextId = Guid.Parse(contextIdString); var permMapping = Dal.GetPermissionContextsViewByContextId(contextId).ToList(); - + Assert.IsNotNull(permMapping, "PermissionContextsView is null"); Assert.IsTrue(permMapping.Count != 0, "PermissionContextsView count: 0"); } @@ -56,7 +57,7 @@ namespace TIAM.Database.Test { var contextId = Guid.Parse(contextIdString); var permMapping = await Dal.GetPermissionContextsViewByContextIdAsync(contextId); - + Assert.IsNotNull(permMapping, "PermissionContextsView is null"); Assert.IsTrue(permMapping.Count != 0, "PermissionContextsView count: 0"); } @@ -65,7 +66,7 @@ namespace TIAM.Database.Test { var productId = Guid.Parse(productIdString); var product = Dal.GetProductById(productId, true); - + Assert.IsNotNull(product, "Product is null"); Assert.IsNotNull(product.Profile, "Profile is null"); Assert.IsNotNull(product.Profile.Address, "Profile.Address is null"); @@ -76,7 +77,7 @@ namespace TIAM.Database.Test [DataTestMethod] public void GetProducts_ReturnProductsJson_WhenProductsExist() { - var products = JsonConvert.DeserializeObject>(Dal.GetProductsJson(false)); + var products = JsonConvert.DeserializeObject>(Dal.GetProductsJson(false)); Assert.IsNotNull(products, "Products is null"); Assert.IsTrue(products.Count > 0, "No products found"); @@ -156,8 +157,8 @@ namespace TIAM.Database.Test { var userProductCarId = Guid.Parse(userProductCarIdString); - var serializedUserProductMapping = Dal.Session(ctx - => ctx.UserProductMappings.FirstOrDefault(x + var serializedUserProductMapping = Dal.Session(ctx + => ctx.UserProductMappings.FirstOrDefault(x => x.JsonDetailModel != null && x.JsonDetailModel.Cars != null && x.JsonDetailModel.Cars.Any(c => c.UserProductCarId == userProductCarId))?.ToJson()); //var transfers = Dal.Session(x => x.GetTransfers()).ToList(); @@ -292,7 +293,7 @@ namespace TIAM.Database.Test var users = JsonConvert.DeserializeObject>(userJson); Assert.IsNotNull(users); - Assert.IsTrue(users.Count>0); + Assert.IsTrue(users.Count > 0); } #region Transfer @@ -347,7 +348,7 @@ namespace TIAM.Database.Test Assert.IsTrue(transferDestinationToProduct.TransferDestination.Id == transferDestinationId, "transferDestinationToProduct.TransferDestination.Id != transferDestinationId"); } - + [DataTestMethod] [DataRow(["8f38f8e3-a92c-4979-88b1-dc812a82245f", "814b5495-c2e9-4f1d-a73f-37cd5d353078", "71392CFD-FB9C-45C1-9540-7BE3782CF26A", "b3f51770-c821-4207-be2a-e622fed2a731"])] public async Task TransferCrudTest(string[] transferIdProductIdUserProductIdCarIdStrings) @@ -469,7 +470,7 @@ namespace TIAM.Database.Test transferDest.Price = 20000; transferDest.Address.AddressText = modifiedAddress; - + Assert.IsTrue(await Dal.UpdateTransferDestinationAsync(transferDest)); transferDest = Dal.GetTransferDestinationById(transferDestId); @@ -512,7 +513,7 @@ namespace TIAM.Database.Test var emailMessages = await Dal.GetEmailMessagesAsync(userId, userProductMappingId); Assert.IsNotNull(emailMessages); - + Assert.IsTrue(emailMessages.Count > 0); Assert.IsTrue(emailMessages.All(x => x.Recipients.Any(recipient => recipient.RecipientId == userId || recipient.RecipientId == userProductMappingId))); } @@ -530,7 +531,7 @@ namespace TIAM.Database.Test var subject = "Transfer - Budapest, Liszt Ferenc tér"; var text = "1211 Budapest, Kossuth Lajos utca 145"; - + await Dal.RemoveEmailMessageAsync(emailMessageId); //kitöröljük a szemetet, ha korábbról bentmaradt - J. var emailMessage = new EmailMessage(emailMessageId, senderId, contextId, subject, text, senderEmail); @@ -547,7 +548,7 @@ namespace TIAM.Database.Test var modifiedText = "modifiedText"; emailMessage.Text = modifiedText; - + Assert.IsTrue(await Dal.UpdateEmailMessageAsync(emailMessage)); @@ -566,6 +567,51 @@ namespace TIAM.Database.Test } #endregion EmailMessage + + #region User + [DataTestMethod] + [DataRow(["e31044d7-1771-4a32-8dd9-6f9853ed53c6", "0a831191-70a3-4504-9ec4-c5902affaba7", "8eed080c-d2ce-4cc3-bcfe-2268c220bba7", "addUser_test9432@tiam.hu"])] + public async Task AddUserTest(string[] userIdProfileIdAddressIdEmailStrings) + { + var userId = Guid.Parse(userIdProfileIdAddressIdEmailStrings[0]); + var profileId = Guid.Parse(userIdProfileIdAddressIdEmailStrings[1]); + var addressId = Guid.Parse(userIdProfileIdAddressIdEmailStrings[2]); + var email = userIdProfileIdAddressIdEmailStrings[3]; + + var fromAddress = "Budapest, Liszt Ferenc tér"; + var toAddress = "1211 Budapest, Kossuth Lajos utca 145"; + //var userProductToCarId = Guid.Parse("97179a87-d99f-4f12-b7b2-75e21aaec6ab"); + + await Dal.RemoveUserAsync(userId); //kitöröljük a szemetet, ha korábbról bentmaradt - J. + + var user = new User(userId, email, "235664", "dsfglfjg45r34903t3kggvq"); + //user.ProfileId = profileId; + + var profile = new Profile(); + profile.Id = profileId;; + profile.Name = "Add user test name"; + + var address = new Address(); + address.Id = addressId; + address.Latitude = 5362.2341652256; + address.Longitude = 5362.2341333317; + address.AddressText = "1214 Kossuth Lajos utca 124."; + + user.Profile = profile; + user.Profile.Address = address; + + Assert.IsTrue(await Dal.AddUser(user)); + user = Dal.GetUserById(userId); + + Assert.IsNotNull(user); + Assert.IsNotNull(user.Profile); + Assert.IsNotNull(user.Profile.Address); + + Assert.IsTrue(await Dal.RemoveUserAsync(userId)); //mielőbb kitöröljük, h ne maradjon szemét a db-ben - J. + + user = Dal.GetUserById(userId); + Assert.IsNull(user); //a korábbi törlés miatt NULL kell legyen - J. + } + #endregion } } - \ No newline at end of file diff --git a/TIAM.Database.Test/TIAM.Database.Test.csproj b/TIAM.Database.Test/TIAM.Database.Test.csproj index bfb33943..080f34d3 100644 --- a/TIAM.Database.Test/TIAM.Database.Test.csproj +++ b/TIAM.Database.Test/TIAM.Database.Test.csproj @@ -10,15 +10,15 @@ - - - - - + + + + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs index 752c1339..afa66892 100644 --- a/TIAM.Database/DataLayers/Admins/AdminDal.cs +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -9,10 +9,12 @@ using TIAM.Database.DbSets.Permissions; using TIAM.Database.DbSets.Products; using TIAM.Database.DbSets.Transfers; using TIAM.Database.DbSets.Users; +using TIAM.Entities.Addresses; using TIAM.Entities.Drivers; using TIAM.Entities.Emails; using TIAM.Entities.Permissions; using TIAM.Entities.Products; +using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Transfers; using TIAM.Entities.Users; @@ -99,6 +101,27 @@ namespace TIAM.Database.DataLayers.Admins public string? GetUserJsonById(Guid userId) => Session(ctx => ctx.GetUserById(userId)?.ToJson()); public string GetUsersJson() => Session(ctx => ctx.Users.ToJson()); + public Task AddUser(User user) => TransactionAsync(ctx => ctx.AddUser(user)); + + public Task AddUser(User user, string profileName, Address address) + { + return TransactionAsync(ctx => + { + var profile = Activator.CreateInstance(); + + profile.Id = Guid.NewGuid(); + profile.Name = profileName; + profile.Address = address; + + user.Profile= profile; + + return ctx.AddUser(user); + }); + } + + public Task RemoveUserAsync(User user) => TransactionAsync(ctx => ctx.RemoveUserAsync(user)); + public Task RemoveUserAsync(Guid userId) => TransactionAsync(ctx => ctx.RemoveUserAsync(userId)); + public Product? GetProductById(Guid contextId, bool includeUsers = true) => Session(ctx => ctx.GetProductById(contextId, includeUsers)); public string GetProductsJson(bool includeUsers = true) => Session(ctx => ctx.ProductsWithUserRelations(includeUsers).ToJson()); diff --git a/TIAM.Database/TIAM.Database.csproj b/TIAM.Database/TIAM.Database.csproj index 44bf565e..b9bcb4c4 100644 --- a/TIAM.Database/TIAM.Database.csproj +++ b/TIAM.Database/TIAM.Database.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/TIAM.Entities/TIAM.Entities.csproj b/TIAM.Entities/TIAM.Entities.csproj index 200c753e..711e424c 100644 --- a/TIAM.Entities/TIAM.Entities.csproj +++ b/TIAM.Entities/TIAM.Entities.csproj @@ -32,7 +32,7 @@ - + diff --git a/TIAMMobileApp/TIAMMobileApp.csproj b/TIAMMobileApp/TIAMMobileApp.csproj index 6ace022f..01bef5c6 100644 --- a/TIAMMobileApp/TIAMMobileApp.csproj +++ b/TIAMMobileApp/TIAMMobileApp.csproj @@ -64,7 +64,7 @@ - + @@ -83,15 +83,15 @@ - + - + - + diff --git a/TIAMSharedUI/TIAMSharedUI.csproj b/TIAMSharedUI/TIAMSharedUI.csproj index 5195e945..8f0f9df9 100644 --- a/TIAMSharedUI/TIAMSharedUI.csproj +++ b/TIAMSharedUI/TIAMSharedUI.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/TIAMWebApp/Client/TIAMWebApp.Client.csproj b/TIAMWebApp/Client/TIAMWebApp.Client.csproj index 451f6e07..48a53d21 100644 --- a/TIAMWebApp/Client/TIAMWebApp.Client.csproj +++ b/TIAMWebApp/Client/TIAMWebApp.Client.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/TIAMWebApp/Server/Services/TransferBackendService.cs b/TIAMWebApp/Server/Services/TransferBackendService.cs index 5b2909b3..9e6e4beb 100644 --- a/TIAMWebApp/Server/Services/TransferBackendService.cs +++ b/TIAMWebApp/Server/Services/TransferBackendService.cs @@ -9,7 +9,7 @@ namespace TIAMWebApp.Server.Services public class TransferBackendService { private readonly IConfiguration _configuration; - public AdminDal _adminDal; + private readonly AdminDal _adminDal; public TransferBackendService(IConfiguration configuration, AdminDal adminDal) { @@ -42,14 +42,14 @@ namespace TIAMWebApp.Server.Services var price = GetSeatNumberPrice(in tranferDestinationPrice, seatNumber); //TODO: ExtraPrice - J. - + //if (baseDestination.Id == fromTransferDestination.Id && ) return price; } public double GetSeatNumberPrice(in ITransfeDestinationPrices transfeDestinationPrices, in byte seatNumber) => GetSeatNumberPrice(transfeDestinationPrices.Price, transfeDestinationPrices.Price2, transfeDestinationPrices.Price3, seatNumber); - public double GetSeatNumberPrice(in double price, in double? price2, in double? price3, in byte seatNumber) + public double GetSeatNumberPrice(double price, in double? price2, in double? price3, in byte seatNumber) { return seatNumber switch { diff --git a/TIAMWebApp/Server/TIAMWebApp.Server.csproj b/TIAMWebApp/Server/TIAMWebApp.Server.csproj index 2bfc8f59..150fbda5 100644 --- a/TIAMWebApp/Server/TIAMWebApp.Server.csproj +++ b/TIAMWebApp/Server/TIAMWebApp.Server.csproj @@ -11,12 +11,12 @@ - - - - + + + + - + diff --git a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj index 4095838e..878a85be 100644 --- a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj +++ b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj @@ -17,9 +17,9 @@ - + - + diff --git a/TourIAmProject.sln b/TourIAmProject.sln index 60c3d550..aa83a6c6 100644 --- a/TourIAmProject.sln +++ b/TourIAmProject.sln @@ -37,6 +37,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TIAM.Models", "TIAM.Models\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TIAM.Resources", "TIAMResources\TIAM.Resources.csproj", "{2A300982-AA2E-4E62-97F2-6EF4C97939B2}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DD32C7C2-218C-4148-8FD6-1AB3C824A7D5}" + ProjectSection(SolutionItems) = preProject + SqlSchemaCompare_Dev_to_DevRelease.scmp = SqlSchemaCompare_Dev_to_DevRelease.scmp + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU