model fixed, BillingInfo mapping fixed, InstallDev fixed.

@Documentation/BlueprintOptimizer.simp

@@ -147,7 +147,7 @@
     <entity-ids>
       <counter>
         <item-type type-id="group" type="Group" />
-        <value>4075</value>
+        <value>4093</value>
       </counter>
       <counter>
         <item-type type-id="erd-entity" type="Entity" />
@@ -724,7 +724,7 @@
           </documentation>
           <abstract-items />
           <sub-models />
-          <diagram type="entity-relationship" id="pca974f586cd54eb2957d89ec61c4843d_762498462" name="BOServer" order-index="0" uid="" show-id="false" show-name="true" show-parent-name="false" name-style="local-auto-parents" show-stereotypes="true" show-tagged-values="false" show-template-parameters="true" show-fields="true" show-field-tags="true" show-empty-compartments="true" show-special-indicators="false" show-rules="true" show-attributes="true" show-attribute-visibility="true" show-operations="true" show-operation-parameters="true" show-operation-visibility="true" show-visibility-sign="true" show-nullability="true" show-sequence-number="false" show-extension-points="false" show-relationship-texts="true" show-data="true" show-description="false" show-field-description="false" auto-routed-paths="false" default-line-style="default" default-type-set="MSSQL" view-location="1502,-6">
+          <diagram type="entity-relationship" id="pca974f586cd54eb2957d89ec61c4843d_762498462" name="BOServer" order-index="0" uid="" show-id="false" show-name="true" show-parent-name="false" name-style="local-auto-parents" show-stereotypes="true" show-tagged-values="false" show-template-parameters="true" show-fields="true" show-field-tags="true" show-empty-compartments="true" show-special-indicators="false" show-rules="true" show-attributes="true" show-attribute-visibility="true" show-operations="true" show-operation-parameters="true" show-operation-visibility="true" show-visibility-sign="true" show-nullability="true" show-sequence-number="false" show-extension-points="false" show-relationship-texts="true" show-data="true" show-description="false" show-field-description="false" auto-routed-paths="false" default-line-style="default" default-type-set="MSSQL" view-location="640,1487">
             <style>
               <background-color index="1" color="#FFFFFFFF" />
               <background-color index="2" color="#FFFFFFFF" />
@@ -2872,13 +2872,13 @@
                 <erd-entity show-nullability="true" show-description="true" />
               </item>
               <item id="cf2ea12ad0ab48b1961d886a52ca9617" iid="dbc09317f996480497834aef343b332a" creation-date="07/27/2021 05:24:19" order-index="1" type="entity">
-                <layout ax="1496" ay="868" awidth="326" aheight="205" x="1496" y="868" width="326" height="205" rotation-center="-93,-22.5" />
+                <layout ax="1434" ay="722" awidth="326" aheight="205" x="1434" y="722" width="326" height="205" rotation-center="-93,-22.5" />
                 <erd-entity show-nullability="true" show-description="true" />
               </item>
               <item id="52988c995dbd4461914ed99b6307b1f8" iid="c8f489ed074c4b8c8dde7e0ee8b7bc8c" creation-date="07/27/2021 05:28:53" order-index="2" type="relation">
-                <layout start-role-position="25,15" end-role-position="25,-15" line-style="straight" lock-start-point="true" lock-to-fields="true" auto-path="" x1="1822" y1="972" x2="1862" y2="1262" start-border-pos="0.376219512195122" end-border-pos="0.932421875" start-local-pos="104" end-local-pos="86" name-position="0,20">
+                <layout start-role-position="25,15" end-role-position="25,-15" line-style="straight" lock-start-point="true" lock-to-fields="true" auto-path="" x1="1760" y1="826" x2="1862" y2="1262" start-border-pos="0.376219512195122" end-border-pos="0.932421875" start-local-pos="104" end-local-pos="86" name-position="0,20">
                   <points>
-                    <point x="1822" y="972" />
+                    <point x="1760" y="826" />
                     <point x="1862" y="1262" />
                   </points>
                 </layout>
@@ -2907,9 +2907,9 @@
                 <relation from="24a5c2e6d7df4dd380da583904b6e81c" from-iid="79f5dcb934c842a1bddc246988b2b33b" from-field="a2d6410d2a3cc498880eae4fa10d65477142" to="ef322c9446f34d3db88bcf4cbdcbbbda" to-iid="68002f8afdb045bea4ad4abf68c5d193" to-field="a807a3f93ff154a9bbd2f13a3b9971b2c353" />
               </item>
               <item id="65cd1e707d594ac4b17e91ddd56e0dd8" iid="72864f05453047dbadb9dcc4387f4da7" creation-date="07/27/2021 05:47:09" order-index="6" type="relation">
-                <layout start-role-position="25,15" end-role-position="25,-15" line-style="straight" lock-to-fields="true" auto-path="" x1="1822" y1="990" x2="1884" y2="579" start-border-pos="0.399390243902439" end-border-pos="0.945180084745763" start-local-pos="122" end-local-pos="103" name-position="0,20">
+                <layout start-role-position="25,15" end-role-position="25,-15" line-style="straight" lock-to-fields="true" auto-path="" x1="1760" y1="844" x2="1884" y2="579" start-border-pos="0.399390243902439" end-border-pos="0.945180084745763" start-local-pos="122" end-local-pos="103" name-position="0,20">
                   <points>
-                    <point x="1822" y="990" />
+                    <point x="1760" y="844" />
                     <point x="1884" y="579" />
                   </points>
                 </layout>
@@ -4334,16 +4334,16 @@
                       <item id="9a662f3ae65b496193f8b84bd1da19ea" cid="GRD009" type="ui-grid" name="Grid8" style-class="" owner="407791e64a7544d3bf9ae397d6ce22f1" change-tracking-state="added" creator="CDoZfQE0eoPT0twKUywpA2Pd3T+96zsw7WLZGMEzIl1z2XhR" creation-date="07/28/2021 07:32:18">
                         <grid>
                           <columns>
-                            <column id="uigc-ff6d9000-3b17-420c-820e-b096415de505" name="Date" />
-                            <column id="uigc-686b4cbb-4191-4247-a885-203e1e0c3e7d" name="Ivoice Number" />
-                            <column id="uigc-ef0c8cef-8654-4efb-91a5-246e6c4c81e1" name="Items" />
-                            <column id="uigc-f581a598-1e3f-48bd-a6ca-fa1f502ef499" name="Billing Plan" />
-                            <column id="uigc-0903c79d-3695-475f-8765-3f62c9c3a7c0" name="Billing Info" />
-                            <column id="uigc-46d01587-589e-42cb-a657-8f61e4c2a4df" name="Total incl VAT" />
-                            <column id="uigc-b73d12c7-e896-4b3b-8e5c-7a05438dc888" name="Total Base" />
-                            <column id="uigc-0454ea0c-2c96-4096-aa9a-9bf917ac243e" name="VAT" />
-                            <column id="uigc-29394bee-df26-4918-b415-122fd5b1fbb1" name="Payed" />
-                            <column id="uigc-536031b2-14ba-42cd-8ba0-626568c83749" name="Channel" />
+                            <column id="uigc-cebd1bca-d3ac-48a2-a96d-b9d94022b166" name="Date" />
+                            <column id="uigc-58084d59-0850-4f7c-8c30-065d0fef731e" name="Ivoice Number" />
+                            <column id="uigc-86e4a041-c1a8-446e-a17d-d74a94ffd38a" name="Items" />
+                            <column id="uigc-8a0859a7-9b98-42de-83ea-a26ab22c1d58" name="Billing Plan" />
+                            <column id="uigc-f64137d0-aa44-4be5-97bf-ac4dba3d018c" name="Billing Info" />
+                            <column id="uigc-1204b1e6-a875-4d45-b2bd-a4aee9a77094" name="Total incl VAT" />
+                            <column id="uigc-c9b13ec3-cb60-4c04-a270-90cde46fb01a" name="Total Base" />
+                            <column id="uigc-6910b8e1-f8ef-4e4c-be63-f0b4cee16a39" name="VAT" />
+                            <column id="uigc-a6636414-ce9e-4d83-8fcd-d593d43466e8" name="Payed" />
+                            <column id="uigc-aa545014-a68a-43f3-8408-95bc508c4073" name="Channel" />
                           </columns>
                         </grid>
                       </item>
@@ -4365,11 +4365,11 @@
                       <item id="1cbba24993da466f907d82542e588b8d" cid="GRD010" type="ui-grid" name="Grid9" style-class="" owner="97fe3aeca36542caa316f33eaa756f6a" change-tracking-state="added" creator="CDoZfQE0eoPT0twKUywpA2Pd3T+96zsw7WLZGMEzIl1z2XhR" creation-date="07/28/2021 07:35:56">
                         <grid>
                           <columns>
-                            <column id="uigc-0c580bd6-2144-4e6f-8e6a-3638f9a8e182" name="Date" />
-                            <column id="uigc-54d801f6-4b1e-41f1-b6de-86ed456fd489" name="Name" />
-                            <column id="uigc-78e6a99e-3e40-4b34-893f-5317685e1e0d" name="QTY" />
-                            <column id="uigc-962b9e40-8e7b-4a26-b040-5de115d9e148" name="SubTotal base" />
-                            <column id="uigc-5f7b8745-2b10-4cb5-9dbc-cbb8a43e50a9" name="SubTotal VAT" />
+                            <column id="uigc-842775ae-3375-4c67-bf74-296144a044aa" name="Date" />
+                            <column id="uigc-8e8ebeb5-4fd7-403a-b6af-02a84a963f2e" name="Name" />
+                            <column id="uigc-464a8c34-b1c5-4db8-9660-b147de6ff108" name="QTY" />
+                            <column id="uigc-8ed25437-b9d3-41e5-9494-2fa526405a36" name="SubTotal base" />
+                            <column id="uigc-c6fff25a-462c-4335-bb5f-b5f0ad0df71e" name="SubTotal VAT" />
                           </columns>
                         </grid>
                       </item>
@@ -4478,14 +4478,14 @@
                         </stereotype-instances>
                         <grid>
                           <columns>
-                            <column id="uigc-ec594a99-f2df-4805-8759-6f2c3fb73bcc" name="Status" />
-                            <column id="uigc-6b8970e4-9caf-41d0-b1ac-6a41bc8ce4b0" name="Name" />
-                            <column id="uigc-63edee56-f112-49dd-ac82-03ef1df40183" name="Location" />
-                            <column id="uigc-1fdfecfe-713a-4fde-ae84-bf6028e9d379" name="Tags" />
-                            <column id="uigc-2dca269c-63bd-4583-962b-bc78ddbb2c5c" name="Uploaded" />
-                            <column id="uigc-5f97ad32-3066-469d-bb20-57b7b8fac498" name="Uploader" />
-                            <column id="uigc-54f4f227-950c-49a5-80a8-fe3e7701b6c4" name="Processed" />
-                            <column id="uigc-0e15d62d-8457-4da3-b4ca-be0dabc8bcd5" name="Downloaded" />
+                            <column id="uigc-fd61c115-2fca-4beb-945b-74258644c0f2" name="Status" />
+                            <column id="uigc-8bac7311-915f-409b-838d-b5b622b06bd7" name="Name" />
+                            <column id="uigc-a71c13c2-1a1d-4153-baf3-80cf0a403d10" name="Location" />
+                            <column id="uigc-6cb87d1f-7bb6-46a9-b339-80a06964dfc0" name="Tags" />
+                            <column id="uigc-a58db438-1814-4647-ac9b-f9ffac3f232e" name="Uploaded" />
+                            <column id="uigc-0d5f8b7d-2a32-4050-82f8-2a36eda59f5d" name="Uploader" />
+                            <column id="uigc-5453baf1-ad99-4ca5-afa4-f961491da316" name="Processed" />
+                            <column id="uigc-6a56ca68-ab27-4eea-a100-c033be9d0cf1" name="Downloaded" />
                           </columns>
                         </grid>
                       </item>
@@ -4507,8 +4507,8 @@
                       <item id="aba3e589e4ec46e6a26e6cdb4c4e5a7a" cid="GRD005" type="ui-grid" name="Grid5" style-class="" owner="6ece78a4080f4a83867efba2d70b4de5" change-tracking-state="added" creator="CDoZfQE0eoPT0twKUywpA2Pd3T+96zsw7WLZGMEzIl1z2XhR" creation-date="07/28/2021 07:04:44">
                         <grid>
                           <columns>
-                            <column id="uigc-24686ca5-6a86-42bb-8286-df6956bd1902" name="Name" />
-                            <column id="uigc-7893ca59-769e-404e-9baa-80249e4c1829" name="Size" />
+                            <column id="uigc-896a5b7a-fc84-48ef-8598-9c2c1e7d162f" name="Name" />
+                            <column id="uigc-e42b1c9f-548d-42f2-b92c-afe5839cc44d" name="Size" />
                           </columns>
                         </grid>
                       </item>
@@ -4517,10 +4517,10 @@
                       <item id="903705b4cf244c66861cfabd5185f41d" cid="GRD006" type="ui-grid" name="Grid6" style-class="" owner="6ece78a4080f4a83867efba2d70b4de5" change-tracking-state="added" creator="CDoZfQE0eoPT0twKUywpA2Pd3T+96zsw7WLZGMEzIl1z2XhR" creation-date="07/28/2021 07:07:24">
                         <grid>
                           <columns>
-                            <column id="uigc-455a9da0-f52f-4e64-99e8-fffd62fc83e1" name="Date" />
-                            <column id="uigc-5edbb5fd-ea9b-4c6f-a713-08c5103b624e" name="Status" />
-                            <column id="uigc-e0e76d80-3c8f-4636-b8f9-39df2c933554" name="User" />
-                            <column id="uigc-7b1825ed-3c9c-4bac-9309-37fc358aae74" name="Message" />
+                            <column id="uigc-9bb13472-5c53-4df6-8609-31d5eaf40f71" name="Date" />
+                            <column id="uigc-04f7cd2a-679b-4c10-b511-99418f71f052" name="Status" />
+                            <column id="uigc-7d942b77-a692-450c-a86b-d80719d2d9a0" name="User" />
+                            <column id="uigc-e01cfd91-cfa2-4098-ae02-ef3b33520a9e" name="Message" />
                           </columns>
                         </grid>
                       </item>
@@ -5205,8 +5205,8 @@
                   </item>
                   <item id="1085a5f86a0944c0ad687f6e06cffb50" cid="REL015" type="relationship" name="" style-class="" change-tracking-state="added" creator="CDoZfQE0eoPT0twKUywpA2Pd3T+96zsw7WLZGMEzIl1z2XhR" creation-date="07/30/2021 12:12:09" from="dc62b4a6eddb4ffea9922a1210e1965a" to="13a6b5d699e34724b34d2f0e3cf411f6" visibility="package">
                     <relation from="dc62b4a6eddb4ffea9922a1210e1965a" to="13a6b5d699e34724b34d2f0e3cf411f6" derived="false">
-                      <start-role id="umlar-bff59b8e-c398-4291-a6c9-c4d554fb963e" name="" multiplicity="1" navigability="yes" association-type="association" visibility="public" />
-                      <end-role id="umlar-136d5bea-f405-45dd-a63a-ba4f1f501cf8" name="" multiplicity="1" navigability="yes" association-type="association" visibility="private" />
+                      <start-role id="umlar-aaf30175-3b9c-4e99-ba63-9285119a044d" name="" multiplicity="1" navigability="yes" association-type="association" visibility="public" />
+                      <end-role id="umlar-96e3c98e-55e7-4605-8062-679c46b4b5f9" name="" multiplicity="1" navigability="yes" association-type="association" visibility="private" />
                     </relation>
                   </item>
                   <item id="d197a10d487f4feca76eaaa52539564d" cid="C015" type="class" name="Metadocument" style-class="" change-tracking-state="added" creator="CDoZfQE0eoPT0twKUywpA2Pd3T+96zsw7WLZGMEzIl1z2XhR" creation-date="07/30/2021 12:13:29" visibility="undefined">
@@ -5230,6 +5230,7 @@
                       <owned-item ref="4ec933cf2fc84617a9a8494196004a90" />
                       <owned-item ref="4ec933cf2fc84617a9a8494196004a90" />
                       <owned-item ref="4ec933cf2fc84617a9a8494196004a90" />
+                      <owned-item ref="4ec933cf2fc84617a9a8494196004a90" />
                     </owned-items>
                     <attributes>
                       <attribute id="a41e119653aca4d98832721d5cffe17c3247" cid="PROP008" name="Created" creation-date="07/30/2021 13:08:53" property-ref="4ec933cf2fc84617a9a8494196004a90" />
@@ -5331,6 +5332,8 @@
                       <owned-item ref="5ed1b0ad3800445a852c688e71a6c3de" />
                       <owned-item ref="f329c375b119435e8347637cc1bace4f" />
                       <owned-item ref="5ed1b0ad3800445a852c688e71a6c3de" />
+                      <owned-item ref="f329c375b119435e8347637cc1bace4f" />
+                      <owned-item ref="5ed1b0ad3800445a852c688e71a6c3de" />
                     </owned-items>
                     <attributes>
                       <attribute id="ac3f9a2f9163c4d189a8531933c4505ab534" cid="PROP003" name="BillingPlanCopy" creation-date="07/30/2021 13:03:05" property-ref="f329c375b119435e8347637cc1bace4f" />
@@ -5368,8 +5371,8 @@
                   </item>
                   <item id="45a4d933848d4de3b8cfb3de6264f86a" cid="REL023" type="relationship" name="Status" style-class="" change-tracking-state="added" creator="CDoZfQE0eoPT0twKUywpA2Pd3T+96zsw7WLZGMEzIl1z2XhR" creation-date="07/30/2021 12:28:30" from="d9b508c513144e22a67092ae79418750" to="d197a10d487f4feca76eaaa52539564d" visibility="package">
                     <relation from="d9b508c513144e22a67092ae79418750" to="d197a10d487f4feca76eaaa52539564d" derived="false">
-                      <start-role id="umlar-bd3cadfd-9cc7-4af8-ab6b-eb97a3728e0e" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
-                      <end-role id="umlar-ef2eb03f-70c5-4942-a1e4-0a2e4422f790" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
+                      <start-role id="umlar-cc6f5354-06fd-4d5a-bf26-5fbfecdbc699" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
+                      <end-role id="umlar-4771c316-d1f3-45a9-b944-0a8d8652a7a4" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
                     </relation>
                   </item>
                   <item id="270ad5efb5d64112afacbeca5ffeca86" cid="C019" type="class" name="BillingPlan" style-class="" change-tracking-state="added" creator="CDoZfQE0eoPT0twKUywpA2Pd3T+96zsw7WLZGMEzIl1z2XhR" creation-date="07/30/2021 12:32:46" visibility="undefined">
@@ -5405,6 +5408,8 @@
                       <owned-item ref="2a23d5a19cd848a8b3a41e2d3f2ee886" />
                       <owned-item ref="2950a0ddb8b0416da9ccee2fbe9bf227" />
                       <owned-item ref="2a23d5a19cd848a8b3a41e2d3f2ee886" />
+                      <owned-item ref="2950a0ddb8b0416da9ccee2fbe9bf227" />
+                      <owned-item ref="2a23d5a19cd848a8b3a41e2d3f2ee886" />
                     </owned-items>
                     <attributes>
                       <attribute id="a9e9ff08df85849a28cc714ae4ca92c24350" cid="PROP005" name="Presets" creation-date="07/30/2021 13:05:16" property-ref="2950a0ddb8b0416da9ccee2fbe9bf227" />
@@ -5423,8 +5428,8 @@
                       <stereotype id="ca3eacde14404b8a939edc0ba600df9b_state_c" type="state" ref="" />
                     </stereotype-instances>
                     <relation from="13a6b5d699e34724b34d2f0e3cf411f6" to="270ad5efb5d64112afacbeca5ffeca86" derived="false">
-                      <start-role id="umlar-23d6d93b-9cf2-4fdf-a809-0cfe19e90083" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
-                      <end-role id="umlar-84166289-91d8-40c8-8aa6-06a34115bdfd" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
+                      <start-role id="umlar-54aa2819-cf47-4744-93b1-3b078982308c" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
+                      <end-role id="umlar-58c6cfa0-dbc3-4881-b273-17ba0767394d" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
                     </relation>
                   </item>
                   <item id="39db4851d2f34131ba16e6788ed23770" cid="REL037" type="relationship" name="Consumtion" style-class="" change-tracking-state="added" creator="CDoZfQE0eoPT0twKUywpA2Pd3T+96zsw7WLZGMEzIl1z2XhR" creation-date="07/30/2021 12:35:08" from="d197a10d487f4feca76eaaa52539564d" to="270ad5efb5d64112afacbeca5ffeca86" visibility="package">
@@ -5435,14 +5440,14 @@
                       <stereotype id="39db4851d2f34131ba16e6788ed23770_consuption_c" type="consuption" ref="" />
                     </stereotype-instances>
                     <relation from="d197a10d487f4feca76eaaa52539564d" to="270ad5efb5d64112afacbeca5ffeca86" derived="false">
-                      <start-role id="umlar-1d34798c-a09d-40cf-bf58-6d5bedd9739a" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
-                      <end-role id="umlar-727715a3-ecef-4fa7-85c6-5effbd125eac" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
+                      <start-role id="umlar-e7a31bc6-4346-47e7-9436-0018d06110d3" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
+                      <end-role id="umlar-6c321da8-2bb6-4d45-b7b4-4f1f4426dee7" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
                     </relation>
                   </item>
                   <item id="b67adb8f034c4b75a300bd2f45ac7be9" cid="REL040" type="relationship" name="CurrentBillingPlan" style-class="" change-tracking-state="added" creator="CDoZfQE0eoPT0twKUywpA2Pd3T+96zsw7WLZGMEzIl1z2XhR" creation-date="07/30/2021 12:59:55" from="4603ec6ea7b8400d81d3a658cd91d7b2" to="270ad5efb5d64112afacbeca5ffeca86" visibility="package">
                     <relation from="4603ec6ea7b8400d81d3a658cd91d7b2" to="270ad5efb5d64112afacbeca5ffeca86" derived="false">
-                      <start-role id="umlar-ef44e1b1-344d-4123-b5eb-5fde54d110f0" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
-                      <end-role id="umlar-f2ab59f2-0da8-45c4-b8f3-47dca796573e" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
+                      <start-role id="umlar-b9f47174-3d32-49f8-be8f-109e19e197c5" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
+                      <end-role id="umlar-c3aaa1e9-8254-4faa-bb2f-6d7a5fa9aa18" name="" multiplicity="1" navigability="" association-type="association" visibility="public" />
                     </relation>
                   </item>
                   <item id="678131d8520145c6997158360e81dc10" cid="PROP001" type="property" name="IsGold" style-class="" owner="13a6b5d699e34724b34d2f0e3cf411f6" creator="CDoZfQE0eoPT0twKUywpA2Pd3T+96zsw7WLZGMEzIl1z2XhR" creation-date="07/30/2021 13:01:17" visibility="private">

AppServer/Business/Mapper/MapperLong.cs

@@ -24,6 +24,18 @@ namespace BO.AppServer.Business.Mapper
             DefineBiDirection<MimeType,MimeTypeUDto>();
 
             DefineBiDirection<Statistic,StatisticsDto>();
+
+            DefineBiDirection<Workspace, WorkspaceRDto>();
+            DefineBiDirection<Workspace, WorkspaceCDto>();
+            DefineBiDirection<Workspace, WorkspaceUDto>();
+
+
+            DefineBiDirection<Metadocument, DocumentRDto>();
+            DefineBiDirection<Metadocument, DocumentCDto>();
+            
+            DefineBiDirection<Artifact, ArtifactRDto>();
+            DefineBiDirection<Artifact, ArtifactCDto>();
+            
         }
         public void DefineBiDirection<TDao, TDto>() 
             where TDao : class, IDao<long>, new()

AppServer/Business/Services/ConfigurationService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Security.Principal;
 using System.Threading.Tasks;
 using BO.AppServer.Metadata.Dto;
@@ -78,8 +79,8 @@ namespace BO.AppServer.Business.Services
                 var srvCatalogues = scope.ServiceProvider.GetRequiredService<CatalogueService>();
                 var srvUsers = scope.ServiceProvider.GetRequiredService<UserService>();
                 var srvWorkspaces = scope.ServiceProvider.GetRequiredService<WorkspaceService>();
-             
-                await srvCatalogues.CreateBillingPlanAsync(new BillingPlanCDto()
+
+                var task0 = srvCatalogues.CreateBillingPlanAsync(new BillingPlanCDto()
                 {
                     Name = "Unlimited",
                     Code = "UNLIMITED",
@@ -97,25 +98,34 @@ namespace BO.AppServer.Business.Services
                     IsEnabled = true
                 }, true);
 
-                await srvCatalogues.CreateMimeTypeAsync(new MimeTypeCDto()
+                var task1 = srvCatalogues.CreateMimeTypeAsync(new MimeTypeCDto()
+                {
+                    Mimetype1 = "text/plain",
+                    Description = "Plain text file",
+                    Extensions = "txt",
+                    IsEnabled = true
+                }, true);
+
+                var task2 = srvCatalogues.CreateMimeTypeAsync(new MimeTypeCDto()
                 {
                     Mimetype1 = "text/plain",
                     Description = "Plain text file",
                     Extensions = "txt",
-                    IsEnabled = true   
+                    IsEnabled = true
                 }, true);
 
 
-                await EnsureUser(srvUsers, "test", "password","test@bo.com",1029, new[] { RoleEnum.User, RoleEnum.Admin });
+                var task3 = EnsureUser(srvUsers, "test", "password", "test@bo.com", 1029,
+                    new[] { RoleEnum.User, RoleEnum.Admin });
 
-                
-                await srvWorkspaces.CreateWorkspaceAsync(new WorkspaceCDto()
+                Task.WhenAll(task0, task1, task2, task3)
+                    .ContinueWith(async (t) => await srvWorkspaces.CreateWorkspaceAsync(new WorkspaceCDto()
                 {
                     Name = "TestWorkspace",
                     Apipassword = "test",
                     BillingPlanCode = "UNLIMITED",
                     AssignedUserName = "test"
-                });
+                })).Wait();
             }
             return new ResultPlain();
         }
@@ -125,7 +135,7 @@ namespace BO.AppServer.Business.Services
         protected async Task EnsureUser(UserService srvUsers, string userName, string userPassword, string userEmail, int prefferedLCID,
             RoleEnum[] roles)
         {
-            if (!(await srvUsers.ExistsUserByNameAsync(userName)).Value)
+            if (!(srvUsers.ExistsUserByNameAsync(userName).Result.Value))
                 await srvUsers.CreateUserAsync(userName,
                     userPassword,
                     userEmail,

AppServer/Data/Entity/BOContext.cs

@@ -181,11 +181,11 @@ namespace BO.AppServer.Data.Entity
                     .HasForeignKey(d => d.ModifiedByUserId)
                     .HasConstraintName("REL_BillingInfo_User_Modified");
 
-                entity.HasOne(d => d.Workspace)
-                    .WithMany(p => p.BillingInfos)
-                    .HasForeignKey(d => d.WorkspaceId)
-                    .OnDelete(DeleteBehavior.ClientSetNull)
-                    .HasConstraintName("REL_BillingInfo_Workspace");
+                //entity.HasOne(d => d.Workspace)
+                //    .WithMany(p => p.BillingInfos)
+                //    .HasForeignKey(d => d.WorkspaceId)
+                //    .OnDelete(DeleteBehavior.ClientSetNull)
+                //    .HasConstraintName("REL_BillingInfo_Workspace");
             });
 
             modelBuilder.Entity<BillingPlan>(entity =>

AppServer/Data/Entity/BOContext.decl.cs

@@ -19,17 +19,18 @@ namespace BO.AppServer.Data.Entity
                     modelBuilder.Entity<UserWorkspace>()
                         .HasOne(am => am.User)
                         .WithMany(a => a.UserWorkspaces)
-                        .HasForeignKey(am => am.UserId);
+                        .HasForeignKey(am => am.UserId).HasConstraintName("REL_BillingInfo_User");
 
                     modelBuilder.Entity<UserWorkspace>()
                         .HasOne(am => am.Workspace)
                         .WithMany(m => m.UserWorkspaces)
-                        .HasForeignKey(am => am.WorkspaceId);
-
+                        .HasForeignKey(am => am.WorkspaceId).HasConstraintName("REL_BillingInfo_Workspace");
 
+                    //modelBuilder.Entity<BillingInfo>().Metadata.AddIgnored("Workspace");
                     modelBuilder.Entity<Workspace>().HasOne(d => d.BillingInfo)
                     .WithOne(p => p.Workspace)
-                    .OnDelete(DeleteBehavior.ClientSetNull)
+                    .HasForeignKey<BillingInfo>(a => a.WorkspaceId)
+                    .OnDelete(DeleteBehavior.NoAction)
                     .HasConstraintName("REL_Workspace_BillingInfo");
                 }
             );

AppServer/Data/Repository/WorkspaceRepo.cs

@@ -27,7 +27,7 @@ public class WorkspaceRepo : EntityRepository<long,  Workspace>
             if (workspace.Structures == null)
                 workspace.Structures = new List<Structure>();
             
-            workspace.Structures.Add(new Structure(){Created = DateTime.Now,CreatedByUserId = creator.Id});
+            workspace.Structures.Add(new Structure(){Name = "Root", Created = DateTime.Now,CreatedByUserId = creator.Id});
             workspace.UserWorkspaces = new List<UserWorkspace>();
 
             AppendUser(workspace, owner, isDefault);

AppServer/Web/Startup.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO.Abstractions;
 using System.Security.Principal;
+using System.Threading.Tasks;
 using BO.AppServer.Business.Configuration;
 using BO.AppServer.Business.Services;
 using Microsoft.AspNetCore.Authorization;