From 999f2f6e66c7656f0ced6fa2d2e42cc7fba86bb0 Mon Sep 17 00:00:00 2001 From: toumash Date: Mon, 3 Sep 2018 19:51:38 +0200 Subject: [PATCH 01/10] adds first webcon path finder sql query --- WebconWrapper.ConfigServices/Class1.cs | 13 +++++ .../Properties/AssemblyInfo.cs | 36 +++++++++++++ .../WebconWrapper.ConfigServices.csproj | 54 +++++++++++++++++++ WebconWrapper/UserForm.cs | 6 --- 4 files changed, 103 insertions(+), 6 deletions(-) create mode 100644 WebconWrapper.ConfigServices/Class1.cs create mode 100644 WebconWrapper.ConfigServices/Properties/AssemblyInfo.cs create mode 100644 WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj diff --git a/WebconWrapper.ConfigServices/Class1.cs b/WebconWrapper.ConfigServices/Class1.cs new file mode 100644 index 0000000..2afb8a5 --- /dev/null +++ b/WebconWrapper.ConfigServices/Class1.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WebconWrapper.ConfigServices +{ + public class Class1 + { + string getAllPathsQuery = @"select PATH_Name, PATH_IsDefault, PATH_ID, PATH_STPID,PATH_NextSTPId from WFAvaiblePaths"; + } +} diff --git a/WebconWrapper.ConfigServices/Properties/AssemblyInfo.cs b/WebconWrapper.ConfigServices/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..d033e43 --- /dev/null +++ b/WebconWrapper.ConfigServices/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("WebconWrapper.ConfigServices")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("WebconWrapper.ConfigServices")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("819632a0-f75b-40b4-880f-6e8e1b18a1a9")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj b/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj new file mode 100644 index 0000000..4d8f76e --- /dev/null +++ b/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj @@ -0,0 +1,54 @@ + + + + + Debug + AnyCPU + 819632a0-f75b-40b4-880f-6e8e1b18a1a9 + Library + Properties + WebconWrapper.ConfigServices + WebconWrapper.ConfigServices + v4.5.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebconWrapper/UserForm.cs b/WebconWrapper/UserForm.cs index be0eeb9..3002b21 100644 --- a/WebconWrapper/UserForm.cs +++ b/WebconWrapper/UserForm.cs @@ -10,11 +10,6 @@ public class UserForm : Element public int xd = 5; - public SetUpAttributes() - { - Text(5); - } - private void Text(int id) => Attributes.Add(new TextAttribute() { Id = id }); @@ -22,7 +17,6 @@ private void Text(int id) public void Send() { - return this.SetValue() } } } From fa112e67ae561d9d4108f2845c78da9e97d520d1 Mon Sep 17 00:00:00 2001 From: toumash Date: Tue, 4 Sep 2018 10:31:26 +0200 Subject: [PATCH 02/10] adds configSerivces project to solution --- WebconWrapper.sln | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/WebconWrapper.sln b/WebconWrapper.sln index 868fa9b..6dcc1ab 100644 --- a/WebconWrapper.sln +++ b/WebconWrapper.sln @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebconWrapper.Tests", "Webc EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebconWrapper.IntegrationTests", "WebconWrapper.IntegrationTests\WebconWrapper.IntegrationTests.csproj", "{D92D2FB7-C58E-4783-8CE6-D4F1F4FC8572}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebconWrapper.ConfigServices", "WebconWrapper.ConfigServices\WebconWrapper.ConfigServices.csproj", "{819632A0-F75B-40B4-880F-6E8E1B18A1A9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -27,6 +29,10 @@ Global {D92D2FB7-C58E-4783-8CE6-D4F1F4FC8572}.Debug|Any CPU.Build.0 = Debug|Any CPU {D92D2FB7-C58E-4783-8CE6-D4F1F4FC8572}.Release|Any CPU.ActiveCfg = Release|Any CPU {D92D2FB7-C58E-4783-8CE6-D4F1F4FC8572}.Release|Any CPU.Build.0 = Release|Any CPU + {819632A0-F75B-40B4-880F-6E8E1B18A1A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {819632A0-F75B-40B4-880F-6E8E1B18A1A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {819632A0-F75B-40B4-880F-6E8E1B18A1A9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {819632A0-F75B-40B4-880F-6E8E1B18A1A9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From eb4bdae5e13ffd38c9b095c9d6b098711a81f43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C5=82uski?= Date: Sat, 8 Sep 2018 00:34:33 +0200 Subject: [PATCH 03/10] adds all neccessary sql files to the sql dir --- .../sql/dic_fieldtypes.sql | 9 +++ .../sql/fieldnames.sql | 61 +++++++++++++++++ .../sql/fieldtypes.sql | 10 +++ WebconWrapper.ConfigServices/sql/paths.sql | 65 +++++++++++++++++++ WebconWrapper.ConfigServices/sql/steps.sql | 6 ++ .../sql/workflows.sql | 18 +++++ 6 files changed, 169 insertions(+) create mode 100644 WebconWrapper.ConfigServices/sql/dic_fieldtypes.sql create mode 100644 WebconWrapper.ConfigServices/sql/fieldnames.sql create mode 100644 WebconWrapper.ConfigServices/sql/fieldtypes.sql create mode 100644 WebconWrapper.ConfigServices/sql/paths.sql create mode 100644 WebconWrapper.ConfigServices/sql/steps.sql create mode 100644 WebconWrapper.ConfigServices/sql/workflows.sql diff --git a/WebconWrapper.ConfigServices/sql/dic_fieldtypes.sql b/WebconWrapper.ConfigServices/sql/dic_fieldtypes.sql new file mode 100644 index 0000000..c9bb9cf --- /dev/null +++ b/WebconWrapper.ConfigServices/sql/dic_fieldtypes.sql @@ -0,0 +1,9 @@ +SELECT TOP (1000) [TypeID] + ,[TSInsert] + ,[TSUpdate] + ,[RowVersion] + ,[Name] + ,[ObjectName] + ,[Description] + ,[EnglishName] + FROM [BPS_Content].[dbo].[DicFieldDetailTypes] \ No newline at end of file diff --git a/WebconWrapper.ConfigServices/sql/fieldnames.sql b/WebconWrapper.ConfigServices/sql/fieldnames.sql new file mode 100644 index 0000000..38ab3f7 --- /dev/null +++ b/WebconWrapper.ConfigServices/sql/fieldnames.sql @@ -0,0 +1,61 @@ +SELECT TOP (1000) [WFCON_ID] + ,[WFCON_FDEFID] + ,[WFCON_DEFID] + ,[WFCON_WFSID] + ,[WFCON_PLUID] + ,[WFCON_DefaultOrder] + ,[WFCON_IsMultiValue] + ,[WFCON_AutoPostBack] + ,[WFCON_TSInsert] + ,[WFCON_TSUpdate] + ,[WFCON_RowVersion] + ,[WFCON_IsDeleted] + ,[WFCON_SetDefaultValueAlsoOnPostback] + ,[WFCON_ShowInTaskList] + ,[WFCON_ValidationExpression] + ,[WFCON_ValidationExpressionErrorMessage] + ,[WFCON_ShowAsHtmlInReadOnlyMode] + ,[WFCON_FieldTypeID] + ,[WFCON_IsArchival] + ,[WFCON_IsTechnical] + ,[WFCON_FlexiVerificationMode] + ,[WFCON_TemplateID] + ,[WFCON_HistoryIgnoreSQLVisibilityRestrictions] + ,[WFCON_ShowInMobile] + ,[WFCON_ReportsIgnoreSQLVisibilityRestrictions] + ,[WFCON_GroupID] + ,[WFCON_GroupOrder] + ,[WFCON_BreakGlobalConfigurationInheritance] + ,[WFCON_GlobalFieldWFCON_ID] + ,[WFCON_ChoiceFieldType] + ,[WFCON_DefaultBRDID] + ,[WFCON_IsSystemField] + ,[WFCON_IsVisibleSqlBRDID] + ,[WFCON_EditModeSqlBRDID] + ,[WFCON_IsRequiredSqlBRDID] + ,[WFCON_HideInEmails] + ,[WFCON_Prompt] + ,[WFCON_Description] + ,[WFCON_SelectOrCaml] + ,[WFCON_DefaultSelect] + ,[WFCON_AdditionalHTMLAttrib] + ,[WFCON_AddInCode] + ,[WFCON_Config] + ,[WFCON_PromptStyle] + ,[WFCON_ControlStyle] + ,[WFCON_AddInControl] + ,[WFCON_RestrictedRead] + ,[WFCON_Guid] + ,[WFCON_DocumentationDescription] + ,[WFCON_RestrictedVisibility] + ,[WFCON_JsOnValueChangeBRDID] + ,[WFCON_SubelementsCallbackJsBRDID] + ,[WFCON_WFCID] + ,[WFCON_DataSourceFilterBRDID] + ,[WFCON_PersonalData_DEFID] + ,[WFCON_PersonalData_WFSID] + ,[WFCON_PersonalData_WFCONID] + ,[WFCON_PersonalDataType] + ,[WFCON_PersonalDataCleaningMode] + ,[WFCON_PersonalDataShouldCleanHistory] + FROM [BPS_Content].[dbo].[WFConfigurations] \ No newline at end of file diff --git a/WebconWrapper.ConfigServices/sql/fieldtypes.sql b/WebconWrapper.ConfigServices/sql/fieldtypes.sql new file mode 100644 index 0000000..388c97e --- /dev/null +++ b/WebconWrapper.ConfigServices/sql/fieldtypes.sql @@ -0,0 +1,10 @@ +SELECT TOP (1000) [FDEF_ID] + ,[FDEF_WFFieldTypeID] + ,[FDEF_TSInsert] + ,[FDEF_TSUpdate] + ,[FDEF_RowVersion] + ,[FDEF_IsDeleted] + ,[FDEF_Name] + ,[FDEF_Description] + ,[FDEF_Guid] + FROM [BPS_Content].[dbo].[WFFieldDefinitions] \ No newline at end of file diff --git a/WebconWrapper.ConfigServices/sql/paths.sql b/WebconWrapper.ConfigServices/sql/paths.sql new file mode 100644 index 0000000..0dc1f43 --- /dev/null +++ b/WebconWrapper.ConfigServices/sql/paths.sql @@ -0,0 +1,65 @@ +SELECT TOP (1000) [PATH_ID] + ,[PATH_STPID] + ,[PATH_NextSTPID] + ,[PATH_FinishOtherTaskTypeID] + ,[PATH_IsDynamicAssign] + ,[PATH_AssignCONFID] + ,[PATH_IsDynamicAssignDW] + ,[PATH_AssignDWCONFID] + ,[PATH_SendStandardEmails] + ,[PATH_SendStandardEmailsDW] + ,[PATH_IsBackAction] + ,[PATH_ControlType] + ,[PATH_AssigType] + ,[PATH_CausesValidation] + ,[PATH_TSInsert] + ,[PATH_TSUpdate] + ,[PATH_RowVersion] + ,[PATH_IsDeleted] + ,[PATH_Order] + ,[PATH_ShowConfirm] + ,[PATH_StayInEditForm] + ,[PATH_MarkCurrentStepAsCompleted] + ,[PATH_CreateDWInformationTask] + ,[PATH_DesignerData] + ,[PATH_IsDefault] + ,[PATH_ShowInDiagram] + ,[PATH_IsEnableOnSmartPhone] + ,[PATH_MinFinishedTasksModeId] + ,[PATH_MinFinishedTasks] + ,[PATH_MinFinishedTasksPercent] + ,[PATH_ApprovalCommandID] + ,[PATH_IsMailApprovalEnabled] + ,[PATH_ControlTypeDW] + ,[PATH_AllowCover] + ,[PATH_CommentRequired] + ,[PATH_PredefinedAsgnEnabled] + ,[PATH_ConstAsgnEnabled] + ,[PATH_PredefinedAsgnEnabledDW] + ,[PATH_ConstAsgnEnabledDW] + ,[PATH_PredefinedAsgnCovers] + ,[PATH_ConstAsgnCovers] + ,[PATH_PredefinedAsgnCoversDW] + ,[PATH_ConstAsgnCoversDW] + ,[PATH_AllowCoverDW] + ,[PATH_TemplateID] + ,[PATH_LineNumber] + ,[PATH_IsVisibleBRDID] + ,[PATH_Name] + ,[PATH_Description] + ,[PATH_SubmitJScript] + ,[PATH_AssignColName] + ,[PATH_Assigments] + ,[PATH_AssignDWColName] + ,[PATH_AssigmentsDW] + ,[PATH_RestrictedToUsers] + ,[PATH_TaskName] + ,[PATH_TaskDescription] + ,[PATH_Guid] + ,[PATH_ButtonStyle] + ,[PATH_DocumentationDescription] + ,[PATH_OnSubmitUxBRDID] + FROM [BPS_Content].[dbo].[WFAvaiblePaths] + + select PATH_Name, PATH_IsDefault, PATH_ID, PATH_STPID,PATH_NextSTPId + from WFAvaiblePaths \ No newline at end of file diff --git a/WebconWrapper.ConfigServices/sql/steps.sql b/WebconWrapper.ConfigServices/sql/steps.sql new file mode 100644 index 0000000..7de7bd3 --- /dev/null +++ b/WebconWrapper.ConfigServices/sql/steps.sql @@ -0,0 +1,6 @@ +SELECT TOP (1000) [FLD_ID] + ,[FLD_FRMID] + ,[FLD_WFCON] + ,[FLD_IsRequired] + + FROM [BPS_Content].[dbo].[WFStepFormFields] \ No newline at end of file diff --git a/WebconWrapper.ConfigServices/sql/workflows.sql b/WebconWrapper.ConfigServices/sql/workflows.sql new file mode 100644 index 0000000..ea0f3a8 --- /dev/null +++ b/WebconWrapper.ConfigServices/sql/workflows.sql @@ -0,0 +1,18 @@ +SELECT TOP (1000) [WF_ID] + ,[WF_WFDEFID] + ,[WF_TSInsert] + ,[WF_TSUpdate] + ,[WF_RowVersion] + ,[WF_IsDeleted] + ,[WF_Version] + ,[WF_AttachmentSecurityLevel] + ,[WF_AllowToStartManually] + ,[WF_SignatureDefinition] + ,[WF_Name] + ,[WF_Description] + ,[WF_ProcedureFilePath] + ,[WF_Guid] + ,[WF_DocumentationDescription] + ,[WF_Acronym] + ,[WF_DesignerData] + FROM [BPS_Content].[dbo].[WorkFlows] \ No newline at end of file From aa6f9cd16e8367d10d80b37239d56ebc80c9dc98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C5=82uski?= Date: Sun, 9 Sep 2018 22:58:53 +0200 Subject: [PATCH 04/10] adds sql query with field name type workflow --- .../sql/fieldnames.sql | 52 ------------------- .../sql/n_fieldNamesWithTypes.sql | 35 +++++++++++++ .../sql/workflows.sql | 14 ----- 3 files changed, 35 insertions(+), 66 deletions(-) create mode 100644 WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql diff --git a/WebconWrapper.ConfigServices/sql/fieldnames.sql b/WebconWrapper.ConfigServices/sql/fieldnames.sql index 38ab3f7..a9ccb02 100644 --- a/WebconWrapper.ConfigServices/sql/fieldnames.sql +++ b/WebconWrapper.ConfigServices/sql/fieldnames.sql @@ -1,61 +1,9 @@ SELECT TOP (1000) [WFCON_ID] ,[WFCON_FDEFID] ,[WFCON_DEFID] - ,[WFCON_WFSID] - ,[WFCON_PLUID] - ,[WFCON_DefaultOrder] - ,[WFCON_IsMultiValue] - ,[WFCON_AutoPostBack] - ,[WFCON_TSInsert] - ,[WFCON_TSUpdate] - ,[WFCON_RowVersion] - ,[WFCON_IsDeleted] - ,[WFCON_SetDefaultValueAlsoOnPostback] - ,[WFCON_ShowInTaskList] - ,[WFCON_ValidationExpression] - ,[WFCON_ValidationExpressionErrorMessage] - ,[WFCON_ShowAsHtmlInReadOnlyMode] ,[WFCON_FieldTypeID] ,[WFCON_IsArchival] ,[WFCON_IsTechnical] - ,[WFCON_FlexiVerificationMode] - ,[WFCON_TemplateID] - ,[WFCON_HistoryIgnoreSQLVisibilityRestrictions] - ,[WFCON_ShowInMobile] - ,[WFCON_ReportsIgnoreSQLVisibilityRestrictions] - ,[WFCON_GroupID] - ,[WFCON_GroupOrder] - ,[WFCON_BreakGlobalConfigurationInheritance] - ,[WFCON_GlobalFieldWFCON_ID] ,[WFCON_ChoiceFieldType] - ,[WFCON_DefaultBRDID] - ,[WFCON_IsSystemField] - ,[WFCON_IsVisibleSqlBRDID] - ,[WFCON_EditModeSqlBRDID] - ,[WFCON_IsRequiredSqlBRDID] - ,[WFCON_HideInEmails] ,[WFCON_Prompt] - ,[WFCON_Description] - ,[WFCON_SelectOrCaml] - ,[WFCON_DefaultSelect] - ,[WFCON_AdditionalHTMLAttrib] - ,[WFCON_AddInCode] - ,[WFCON_Config] - ,[WFCON_PromptStyle] - ,[WFCON_ControlStyle] - ,[WFCON_AddInControl] - ,[WFCON_RestrictedRead] - ,[WFCON_Guid] - ,[WFCON_DocumentationDescription] - ,[WFCON_RestrictedVisibility] - ,[WFCON_JsOnValueChangeBRDID] - ,[WFCON_SubelementsCallbackJsBRDID] - ,[WFCON_WFCID] - ,[WFCON_DataSourceFilterBRDID] - ,[WFCON_PersonalData_DEFID] - ,[WFCON_PersonalData_WFSID] - ,[WFCON_PersonalData_WFCONID] - ,[WFCON_PersonalDataType] - ,[WFCON_PersonalDataCleaningMode] - ,[WFCON_PersonalDataShouldCleanHistory] FROM [BPS_Content].[dbo].[WFConfigurations] \ No newline at end of file diff --git a/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql b/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql new file mode 100644 index 0000000..f039145 --- /dev/null +++ b/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql @@ -0,0 +1,35 @@ +SELECT + wf.WF_Name, + c.[WFCON_ID] + , c.[WFCON_FDEFID] + , c.[WFCON_DEFID] + , c.[WFCON_FieldTypeID] + , c.[WFCON_IsArchival] + , c.[WFCON_IsTechnical] + , c.[WFCON_ChoiceFieldType] + , c.[WFCON_Prompt] + , c.WFCON_IsDeleted + , d.Name + , d.ObjectName + , d.EnglishName +FROM [BPS_Content].[dbo].[WFConfigurations] c + INNER JOIN + (SELECT TOP (1000) + [TypeID] + , [Name] + , [ObjectName] + , [Description] + , [EnglishName] + FROM [BPS_Content].[dbo].[DicFieldDetailTypes]) +d + ON d.TypeID = c.WFCON_FieldTypeID + LEFT JOIN + (SELECT TOP (1000) + [WF_ID] + , [WF_WFDEFID] + , [WF_Name] + FROM [BPS_Content].[dbo].[WorkFlows]) +wf + ON wf.WF_WFDEFID = c.WFCON_DEFID +where c.WFCON_IsDeleted = 0 +order by WF_Name \ No newline at end of file diff --git a/WebconWrapper.ConfigServices/sql/workflows.sql b/WebconWrapper.ConfigServices/sql/workflows.sql index ea0f3a8..9280d93 100644 --- a/WebconWrapper.ConfigServices/sql/workflows.sql +++ b/WebconWrapper.ConfigServices/sql/workflows.sql @@ -1,18 +1,4 @@ SELECT TOP (1000) [WF_ID] ,[WF_WFDEFID] - ,[WF_TSInsert] - ,[WF_TSUpdate] - ,[WF_RowVersion] - ,[WF_IsDeleted] - ,[WF_Version] - ,[WF_AttachmentSecurityLevel] - ,[WF_AllowToStartManually] - ,[WF_SignatureDefinition] ,[WF_Name] - ,[WF_Description] - ,[WF_ProcedureFilePath] - ,[WF_Guid] - ,[WF_DocumentationDescription] - ,[WF_Acronym] - ,[WF_DesignerData] FROM [BPS_Content].[dbo].[WorkFlows] \ No newline at end of file From 2ac0cabfb511b5650a5767c6a81098681d711ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C5=82uski?= Date: Sun, 9 Sep 2018 23:04:46 +0200 Subject: [PATCH 05/10] removes tops from selects --- .../sql/n_fieldNamesWithTypes.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql b/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql index f039145..8efc1b6 100644 --- a/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql +++ b/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql @@ -14,7 +14,7 @@ SELECT , d.EnglishName FROM [BPS_Content].[dbo].[WFConfigurations] c INNER JOIN - (SELECT TOP (1000) + (SELECT [TypeID] , [Name] , [ObjectName] @@ -24,12 +24,12 @@ FROM [BPS_Content].[dbo].[WFConfigurations] c d ON d.TypeID = c.WFCON_FieldTypeID LEFT JOIN - (SELECT TOP (1000) - [WF_ID] - , [WF_WFDEFID] - , [WF_Name] + (SELECT + -- [WF_ID], + [WF_WFDEFID], + [WF_Name] FROM [BPS_Content].[dbo].[WorkFlows]) wf ON wf.WF_WFDEFID = c.WFCON_DEFID -where c.WFCON_IsDeleted = 0 +where c.WFCON_IsDeleted = 0 order by WF_Name \ No newline at end of file From 90e72d799ae9e09551326ceacb0761ec6edc96c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C5=82uski?= Date: Sun, 9 Sep 2018 23:07:22 +0200 Subject: [PATCH 06/10] removes unneccesary columns such as technical and stuff --- WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql b/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql index 8efc1b6..2c9f69b 100644 --- a/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql +++ b/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql @@ -4,14 +4,13 @@ SELECT , c.[WFCON_FDEFID] , c.[WFCON_DEFID] , c.[WFCON_FieldTypeID] - , c.[WFCON_IsArchival] - , c.[WFCON_IsTechnical] + -- , c.[WFCON_IsArchival] + -- , c.[WFCON_IsTechnical] , c.[WFCON_ChoiceFieldType] , c.[WFCON_Prompt] - , c.WFCON_IsDeleted , d.Name , d.ObjectName - , d.EnglishName +-- , d.EnglishName FROM [BPS_Content].[dbo].[WFConfigurations] c INNER JOIN (SELECT From 153724181bfe31620f98603c13abee0b4adc864f Mon Sep 17 00:00:00 2001 From: toumash Date: Sun, 9 Sep 2018 23:34:34 +0200 Subject: [PATCH 07/10] adds sql files into the project --- WebconWrapper.ConfigServices/Class1.cs | 13 -- .../ConfigServices.Designer.cs | 93 +++++++++++++ .../ConfigServices.resx | 124 ++++++++++++++++++ WebconWrapper.ConfigServices/Configuration.cs | 24 ++++ .../WebconWrapper.ConfigServices.csproj | 52 +++++--- 5 files changed, 275 insertions(+), 31 deletions(-) delete mode 100644 WebconWrapper.ConfigServices/Class1.cs create mode 100644 WebconWrapper.ConfigServices/ConfigServices.Designer.cs create mode 100644 WebconWrapper.ConfigServices/ConfigServices.resx create mode 100644 WebconWrapper.ConfigServices/Configuration.cs diff --git a/WebconWrapper.ConfigServices/Class1.cs b/WebconWrapper.ConfigServices/Class1.cs deleted file mode 100644 index 2afb8a5..0000000 --- a/WebconWrapper.ConfigServices/Class1.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace WebconWrapper.ConfigServices -{ - public class Class1 - { - string getAllPathsQuery = @"select PATH_Name, PATH_IsDefault, PATH_ID, PATH_STPID,PATH_NextSTPId from WFAvaiblePaths"; - } -} diff --git a/WebconWrapper.ConfigServices/ConfigServices.Designer.cs b/WebconWrapper.ConfigServices/ConfigServices.Designer.cs new file mode 100644 index 0000000..c0876e5 --- /dev/null +++ b/WebconWrapper.ConfigServices/ConfigServices.Designer.cs @@ -0,0 +1,93 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace WebconWrapper.ConfigServices { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class ConfigServices { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal ConfigServices() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WebconWrapper.ConfigServices.ConfigServices", typeof(ConfigServices).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to SELECT + /// wf.WF_Name, + /// c.[WFCON_ID] + /// , c.[WFCON_FDEFID] + /// , c.[WFCON_DEFID] + /// , c.[WFCON_FieldTypeID] + /// -- , c.[WFCON_IsArchival] + /// -- , c.[WFCON_IsTechnical] + /// , c.[WFCON_ChoiceFieldType] + /// , c.[WFCON_Prompt] + /// , d.Name + /// , d.ObjectName + ///-- , d.EnglishName + ///FROM [BPS_Content].[dbo].[WFConfigurations] c + /// INNER JOIN + /// (SELECT + /// [TypeID] + /// , [Name] + /// , [ObjectName] + /// , [Description] + /// , [EnglishName] + /// FROM [BPS_Content [rest of string was truncated]";. + /// + public static string AllAttritubes { + get { + return ResourceManager.GetString("AllAttritubes", resourceCulture); + } + } + } +} diff --git a/WebconWrapper.ConfigServices/ConfigServices.resx b/WebconWrapper.ConfigServices/ConfigServices.resx new file mode 100644 index 0000000..01104fe --- /dev/null +++ b/WebconWrapper.ConfigServices/ConfigServices.resx @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + sql\n_fieldnameswithtypes.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;windows-1250 + + \ No newline at end of file diff --git a/WebconWrapper.ConfigServices/Configuration.cs b/WebconWrapper.ConfigServices/Configuration.cs new file mode 100644 index 0000000..f7955cb --- /dev/null +++ b/WebconWrapper.ConfigServices/Configuration.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WebconWrapper.ConfigServices +{ + public class Configuration + { + private static Configuration _instance; + public static Configuration Instance + { + get + { + if (_instance == null) + _instance = new Configuration(); + return _instance; + } + } + + public string AllAttributesQuery => ConfigServices.AllAttritubes; + } +} diff --git a/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj b/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj index 4d8f76e..f6247f2 100644 --- a/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj +++ b/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj @@ -1,10 +1,10 @@ - + Debug AnyCPU - 819632a0-f75b-40b4-880f-6e8e1b18a1a9 + {819632A0-F75B-40B4-880F-6E8E1B18A1A9} Library Properties WebconWrapper.ConfigServices @@ -31,24 +31,40 @@ 4 - - - - - - - - - - - - - - + + + + + + + + - + + + True + True + ConfigServices.resx + + + + + + + + + + + + + + + + PublicResXFileCodeGenerator + ConfigServices.Designer.cs + - + \ No newline at end of file From 2743cc03014f27dae6b22b3b2e00bc616689ecfb Mon Sep 17 00:00:00 2001 From: toumash Date: Sun, 9 Sep 2018 23:34:45 +0200 Subject: [PATCH 08/10] changes select names in sql for all attributes --- .../sql/n_fieldNamesWithTypes.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql b/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql index 2c9f69b..bf0e502 100644 --- a/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql +++ b/WebconWrapper.ConfigServices/sql/n_fieldNamesWithTypes.sql @@ -1,14 +1,14 @@ SELECT - wf.WF_Name, - c.[WFCON_ID] + wf.WF_Name as WF_Name, + c.[WFCON_ID] as A_Id , c.[WFCON_FDEFID] - , c.[WFCON_DEFID] - , c.[WFCON_FieldTypeID] + , c.[WFCON_DEFID] as DEFID + , c.[WFCON_FieldTypeID] as A_TypeId -- , c.[WFCON_IsArchival] -- , c.[WFCON_IsTechnical] , c.[WFCON_ChoiceFieldType] - , c.[WFCON_Prompt] - , d.Name + , c.[WFCON_Prompt] as A_Title + , d.Name as A_Type , d.ObjectName -- , d.EnglishName FROM [BPS_Content].[dbo].[WFConfigurations] c From 8b48569e10462a7c21e13a578073ce4e68d56254 Mon Sep 17 00:00:00 2001 From: toumash Date: Sun, 9 Sep 2018 23:35:15 +0200 Subject: [PATCH 09/10] adds repository reading all attributes into the model (not tested) --- .../Model/WebconAttribute.cs | 12 ++++ .../Services/AttributesRepo.cs | 61 +++++++++++++++++++ .../WebconWrapper.ConfigServices.csproj | 2 +- 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 WebconWrapper.ConfigServices/Model/WebconAttribute.cs create mode 100644 WebconWrapper.ConfigServices/Services/AttributesRepo.cs diff --git a/WebconWrapper.ConfigServices/Model/WebconAttribute.cs b/WebconWrapper.ConfigServices/Model/WebconAttribute.cs new file mode 100644 index 0000000..fcdcc2c --- /dev/null +++ b/WebconWrapper.ConfigServices/Model/WebconAttribute.cs @@ -0,0 +1,12 @@ +namespace WebconWrapper.ConfigServices.Model +{ + public class WebconAttribute + { + public long Id { get; set; } + public string WFName { get; set; } + public long DEFID { get; set; } + public string Title { get; set; } + public string Type { get; set; } + public long TypeId { get; set; } + } +} \ No newline at end of file diff --git a/WebconWrapper.ConfigServices/Services/AttributesRepo.cs b/WebconWrapper.ConfigServices/Services/AttributesRepo.cs new file mode 100644 index 0000000..58320c6 --- /dev/null +++ b/WebconWrapper.ConfigServices/Services/AttributesRepo.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WebconWrapper.ConfigServices.Model; + +namespace WebconWrapper.ConfigServices.Services +{ + public class AttributesRepo + { + private readonly string _connectionString; + + public AttributesRepo(string connectionString) + { + _connectionString = connectionString; + } + + public ICollection GetAll() + { + var data = GetAttributesData(); + ICollection attributesInfo = MapToAttributesInfo(data); + return attributesInfo; + } + + private static ICollection MapToAttributesInfo(DataTable data) + { + return data.Rows.Cast().Select(row => + new WebconAttribute() + { + Id = row.Field("A_Id"), + WFName = row.Field("WF_Name"), + DEFID = row.Field("DEFID"), + Title = row.Field("A_Title"), + Type = row.Field("A_Type"), + TypeId = row.Field("A_TypeId") + }).ToList(); + } + + private DataTable GetAttributesData() + { + using (var conn = CreateConnection()) + using (var cmd = new SqlCommand(Configuration.Instance.AllAttributesQuery, conn)) + using (var da = new SqlDataAdapter(cmd)) + { + var dt = new DataTable(); + da.Fill(dt); + return dt; + } + } + + private SqlConnection CreateConnection() + { + var conn = new SqlConnection(_connectionString); + conn.Open(); + return conn; + } + } +} diff --git a/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj b/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj index f6247f2..9f534c7 100644 --- a/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj +++ b/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj @@ -48,7 +48,7 @@ ConfigServices.resx - + From a66f64acb2c3f4fc1e30764b7e24fd06556d4238 Mon Sep 17 00:00:00 2001 From: toumash Date: Sun, 9 Sep 2018 23:44:32 +0200 Subject: [PATCH 10/10] adds integrations test project for confServices and consolidates all packages in the solution --- .../DAL/AttributesRepoTests.cs | 41 +++++ .../Properties/AssemblyInfo.cs | 36 +++++ ...per.ConfigServices.IntegrationTests.csproj | 142 ++++++++++++++++++ .../packages.config | 47 ++++++ .../ConfigServices.Designer.cs | 16 +- .../{Services => DAL}/AttributesRepo.cs | 2 +- .../WebconWrapper.ConfigServices.csproj | 5 +- .../WebconWrapper.IntegrationTests.csproj | 43 +++--- .../packages.config | 22 +-- .../WebconWrapper.Tests.csproj | 39 ++--- WebconWrapper.Tests/packages.config | 20 +-- WebconWrapper.sln | 6 + 12 files changed, 346 insertions(+), 73 deletions(-) create mode 100644 WebconWrapper.ConfigServices.IntegrationTests/DAL/AttributesRepoTests.cs create mode 100644 WebconWrapper.ConfigServices.IntegrationTests/Properties/AssemblyInfo.cs create mode 100644 WebconWrapper.ConfigServices.IntegrationTests/WebconWrapper.ConfigServices.IntegrationTests.csproj create mode 100644 WebconWrapper.ConfigServices.IntegrationTests/packages.config rename WebconWrapper.ConfigServices/{Services => DAL}/AttributesRepo.cs (97%) diff --git a/WebconWrapper.ConfigServices.IntegrationTests/DAL/AttributesRepoTests.cs b/WebconWrapper.ConfigServices.IntegrationTests/DAL/AttributesRepoTests.cs new file mode 100644 index 0000000..05c6ed2 --- /dev/null +++ b/WebconWrapper.ConfigServices.IntegrationTests/DAL/AttributesRepoTests.cs @@ -0,0 +1,41 @@ +using FluentAssertions; +using Moq; +using System; +using WebconWrapper.ConfigServices.DAL; +using Xunit; + +namespace WebconWrapper.ConfigServices.IntegrationTests.DAL +{ + public class AttributesRepoTests : IDisposable + { + private MockRepository mockRepository; + + public AttributesRepoTests() + { + this.mockRepository = new MockRepository(MockBehavior.Strict); + + + } + + public void Dispose() + { + this.mockRepository.VerifyAll(); + } + + private AttributesRepo CreateAttributesRepo() + { + return new AttributesRepo(""); // TODO + } + + [Fact] + public void GetAll_StateUnderTest_ExpectedBehavior() + { + var unitUnderTest = CreateAttributesRepo(); + + var result = unitUnderTest.GetAll(); + + result.Should().NotBeNull(); + result.Should().HaveCountGreaterThan(0); + } + } +} diff --git a/WebconWrapper.ConfigServices.IntegrationTests/Properties/AssemblyInfo.cs b/WebconWrapper.ConfigServices.IntegrationTests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..d311636 --- /dev/null +++ b/WebconWrapper.ConfigServices.IntegrationTests/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("WebconWrapper.ConfigServices.IntegrationTests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("WebconWrapper.ConfigServices.IntegrationTests")] +[assembly: AssemblyCopyright("Copyright © 2015")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("9abbd6a9-5f95-442a-88db-3fc1ebf374a7")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/WebconWrapper.ConfigServices.IntegrationTests/WebconWrapper.ConfigServices.IntegrationTests.csproj b/WebconWrapper.ConfigServices.IntegrationTests/WebconWrapper.ConfigServices.IntegrationTests.csproj new file mode 100644 index 0000000..18f3d7a --- /dev/null +++ b/WebconWrapper.ConfigServices.IntegrationTests/WebconWrapper.ConfigServices.IntegrationTests.csproj @@ -0,0 +1,142 @@ + + + + + + Debug + AnyCPU + {2E3DF5C2-8A38-4A03-86D7-8D463C917E47} + Library + Properties + WebconWrapper.ConfigServices.IntegrationTests + WebconWrapper.ConfigServices.IntegrationTests + v4.5 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll + + + ..\packages\FluentAssertions.5.4.1\lib\net45\FluentAssertions.dll + + + ..\packages\Moq.4.10.0\lib\net45\Moq.dll + + + + + + + + + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll + + + + + ..\packages\xunit.abstractions.2.0.2\lib\net35\xunit.abstractions.dll + True + + + ..\packages\xunit.assert.2.4.0\lib\netstandard1.1\xunit.assert.dll + + + ..\packages\xunit.extensibility.core.2.4.0\lib\netstandard1.1\xunit.core.dll + + + ..\packages\xunit.extensibility.execution.2.4.0\lib\netstandard1.1\xunit.execution.dotnet.dll + + + + + + + + + + + + + + + + + + + + + + + {819632a0-f75b-40b4-880f-6e8e1b18a1a9} + WebconWrapper.ConfigServices + + + + + + + False + + + False + + + False + + + False + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + \ No newline at end of file diff --git a/WebconWrapper.ConfigServices.IntegrationTests/packages.config b/WebconWrapper.ConfigServices.IntegrationTests/packages.config new file mode 100644 index 0000000..bf3f521 --- /dev/null +++ b/WebconWrapper.ConfigServices.IntegrationTests/packages.config @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebconWrapper.ConfigServices/ConfigServices.Designer.cs b/WebconWrapper.ConfigServices/ConfigServices.Designer.cs index c0876e5..c472aa4 100644 --- a/WebconWrapper.ConfigServices/ConfigServices.Designer.cs +++ b/WebconWrapper.ConfigServices/ConfigServices.Designer.cs @@ -62,16 +62,16 @@ internal ConfigServices() { /// /// Looks up a localized string similar to SELECT - /// wf.WF_Name, - /// c.[WFCON_ID] + /// wf.WF_Name as WF_Name, + /// c.[WFCON_ID] as A_Id /// , c.[WFCON_FDEFID] - /// , c.[WFCON_DEFID] - /// , c.[WFCON_FieldTypeID] + /// , c.[WFCON_DEFID] as DEFID + /// , c.[WFCON_FieldTypeID] as A_TypeId /// -- , c.[WFCON_IsArchival] /// -- , c.[WFCON_IsTechnical] /// , c.[WFCON_ChoiceFieldType] - /// , c.[WFCON_Prompt] - /// , d.Name + /// , c.[WFCON_Prompt] as A_Title + /// , d.Name as A_Type /// , d.ObjectName ///-- , d.EnglishName ///FROM [BPS_Content].[dbo].[WFConfigurations] c @@ -80,9 +80,7 @@ internal ConfigServices() { /// [TypeID] /// , [Name] /// , [ObjectName] - /// , [Description] - /// , [EnglishName] - /// FROM [BPS_Content [rest of string was truncated]";. + /// [rest of string was truncated]";. /// public static string AllAttritubes { get { diff --git a/WebconWrapper.ConfigServices/Services/AttributesRepo.cs b/WebconWrapper.ConfigServices/DAL/AttributesRepo.cs similarity index 97% rename from WebconWrapper.ConfigServices/Services/AttributesRepo.cs rename to WebconWrapper.ConfigServices/DAL/AttributesRepo.cs index 58320c6..e301ba2 100644 --- a/WebconWrapper.ConfigServices/Services/AttributesRepo.cs +++ b/WebconWrapper.ConfigServices/DAL/AttributesRepo.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using WebconWrapper.ConfigServices.Model; -namespace WebconWrapper.ConfigServices.Services +namespace WebconWrapper.ConfigServices.DAL { public class AttributesRepo { diff --git a/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj b/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj index 9f534c7..40a73dd 100644 --- a/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj +++ b/WebconWrapper.ConfigServices/WebconWrapper.ConfigServices.csproj @@ -9,9 +9,10 @@ Properties WebconWrapper.ConfigServices WebconWrapper.ConfigServices - v4.5.2 + v4.5 512 true + true @@ -48,7 +49,7 @@ ConfigServices.resx - + diff --git a/WebconWrapper.IntegrationTests/WebconWrapper.IntegrationTests.csproj b/WebconWrapper.IntegrationTests/WebconWrapper.IntegrationTests.csproj index 0b25832..f34db81 100644 --- a/WebconWrapper.IntegrationTests/WebconWrapper.IntegrationTests.csproj +++ b/WebconWrapper.IntegrationTests/WebconWrapper.IntegrationTests.csproj @@ -1,8 +1,8 @@  - + + - Debug @@ -36,13 +36,13 @@ - ..\packages\Castle.Core.4.3.0\lib\net45\Castle.Core.dll + ..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll ..\packages\FluentAssertions.5.4.1\lib\net45\FluentAssertions.dll - - ..\packages\Moq.4.8.3\lib\net45\Moq.dll + + ..\packages\Moq.4.10.0\lib\net45\Moq.dll @@ -69,16 +69,17 @@ - ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll + ..\packages\xunit.abstractions.2.0.2\lib\net35\xunit.abstractions.dll + True - - ..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll + + ..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll - - ..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll + + ..\packages\xunit.extensibility.core.2.4.0\lib\net452\xunit.core.dll - - ..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll + + ..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll @@ -90,26 +91,26 @@ - - - {d5907367-4aac-4518-adbf-bd0f109a742d} WebconWrapper + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + - - + + \ No newline at end of file diff --git a/WebconWrapper.IntegrationTests/packages.config b/WebconWrapper.IntegrationTests/packages.config index 308c4b4..b73b566 100644 --- a/WebconWrapper.IntegrationTests/packages.config +++ b/WebconWrapper.IntegrationTests/packages.config @@ -1,21 +1,21 @@  - + - - + + - - - - - - - + + + + + + + - + \ No newline at end of file diff --git a/WebconWrapper.Tests/WebconWrapper.Tests.csproj b/WebconWrapper.Tests/WebconWrapper.Tests.csproj index 5e7c3b9..5d8050b 100644 --- a/WebconWrapper.Tests/WebconWrapper.Tests.csproj +++ b/WebconWrapper.Tests/WebconWrapper.Tests.csproj @@ -1,8 +1,8 @@  - + + - Debug @@ -36,13 +36,13 @@ - ..\packages\Castle.Core.4.3.0\lib\net45\Castle.Core.dll + ..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll ..\packages\FluentAssertions.5.4.1\lib\net45\FluentAssertions.dll - - ..\packages\Moq.4.8.3\lib\net45\Moq.dll + + ..\packages\Moq.4.10.0\lib\net45\Moq.dll @@ -62,16 +62,17 @@ - ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll + ..\packages\xunit.abstractions.2.0.2\lib\net35\xunit.abstractions.dll + True - - ..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll + + ..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll - - ..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll + + ..\packages\xunit.extensibility.core.2.4.0\lib\net452\xunit.core.dll - - ..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll + + ..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll @@ -82,24 +83,24 @@ - - - {d5907367-4aac-4518-adbf-bd0f109a742d} WebconWrapper + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + - + \ No newline at end of file diff --git a/WebconWrapper.Tests/packages.config b/WebconWrapper.Tests/packages.config index 4396b3e..c57119c 100644 --- a/WebconWrapper.Tests/packages.config +++ b/WebconWrapper.Tests/packages.config @@ -1,17 +1,17 @@  - + - + - - - - - - - + + + + + + + - + \ No newline at end of file diff --git a/WebconWrapper.sln b/WebconWrapper.sln index 6dcc1ab..be3001f 100644 --- a/WebconWrapper.sln +++ b/WebconWrapper.sln @@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebconWrapper.IntegrationTe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebconWrapper.ConfigServices", "WebconWrapper.ConfigServices\WebconWrapper.ConfigServices.csproj", "{819632A0-F75B-40B4-880F-6E8E1B18A1A9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebconWrapper.ConfigServices.IntegrationTests", "WebconWrapper.ConfigServices.IntegrationTests\WebconWrapper.ConfigServices.IntegrationTests.csproj", "{2E3DF5C2-8A38-4A03-86D7-8D463C917E47}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,6 +35,10 @@ Global {819632A0-F75B-40B4-880F-6E8E1B18A1A9}.Debug|Any CPU.Build.0 = Debug|Any CPU {819632A0-F75B-40B4-880F-6E8E1B18A1A9}.Release|Any CPU.ActiveCfg = Release|Any CPU {819632A0-F75B-40B4-880F-6E8E1B18A1A9}.Release|Any CPU.Build.0 = Release|Any CPU + {2E3DF5C2-8A38-4A03-86D7-8D463C917E47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2E3DF5C2-8A38-4A03-86D7-8D463C917E47}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2E3DF5C2-8A38-4A03-86D7-8D463C917E47}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2E3DF5C2-8A38-4A03-86D7-8D463C917E47}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE