troogs/FoodsharingOnboarding
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Database updates

Browse Source
This commit is contained in:
Andre Beging
2022-04-08 16:10:26 +02:00
parent e8f9c4c0f5
commit 7fb5ecf04a
15 changed files with 583 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

411
FSSiegen.Diagram1.view
View File

@@ -153,26 +153,45 @@
<TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName>
</Oid>
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>10</OID>
<Parent>2</Parent>
</CustomProperties>
<Children />
<Location>
<X>0.5 px</X>
<Y>126.5 px</Y>
</Location>
<Size>
<Width>162 px</Width>
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID">
<Path>bf41429c-3b00-4d34-9851-bf35a3649fd2</Path>
<TypeName>EntityDeveloper.EntityFrameworkCore.EntityProperty</TypeName>
</Oid>
</Model>
</Children>
<Size>
<Width>163 px</Width>
<Height>127 px</Height>
<Height>145 px</Height>
</Size>
<MaxSize>
<Width>0 px</Width>
<Height>127 px</Height>
<Height>145 px</Height>
</MaxSize>
</Model>
<Model xsi:type="RelationPropertiesVwModel">
<CustomProperties>
<OID>10</OID>
<OID>11</OID>
<Parent>1</Parent>
</CustomProperties>
<Children>
<Model xsi:type="RelationPropertyVwModel">
<CustomProperties>
<OID>11</OID>
<Parent>10</Parent>
<OID>12</OID>
<Parent>11</Parent>
</CustomProperties>
<Children />
<Size>
@@ -187,7 +206,7 @@
</Children>
<Location>
<X>0 px</X>
<Y>126 px</Y>
<Y>144 px</Y>
</Location>
<Size>
<Width>163 px</Width>
@@ -201,20 +220,20 @@
</Model>
</Children>
<Location>
<X>208 px</X>
<Y>-56 px</Y>
<X>248 px</X>
<Y>-64 px</Y>
</Location>
<Size>
<Width>168 px</Width>
<Height>212 px</Height>
<Height>230 px</Height>
</Size>
<MinSize>
<Width>100 px</Width>
<Height>212 px</Height>
<Height>230 px</Height>
</MinSize>
<MaxSize>
<Width>800 px</Width>
<Height>212 px</Height>
<Height>230 px</Height>
</MaxSize>
<Ports />
<Oid xsi:type="SchemaModelOID">
@@ -225,20 +244,20 @@
</Model>
<Model xsi:type="EnumTypeVwModel">
<CustomProperties>
<OID>12</OID>
<OID>13</OID>
<Parent>0</Parent>
</CustomProperties>
<Children>
<Model xsi:type="PropertiesVwModel">
<CustomProperties>
<OID>13</OID>
<Parent>12</Parent>
<OID>14</OID>
<Parent>13</Parent>
</CustomProperties>
<Children>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>14</OID>
<Parent>13</Parent>
<OID>15</OID>
<Parent>14</Parent>
</CustomProperties>
<Children />
<Location>
@@ -256,8 +275,8 @@
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>15</OID>
<Parent>13</Parent>
<OID>16</OID>
<Parent>14</Parent>
</CustomProperties>
<Children />
<Location>
@@ -269,14 +288,14 @@
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID">
<Path>fbcf22ae-d06c-4ef4-9375-7da0116c1756</Path>
<Path>b61df6d8-6f93-4605-bcb8-40e631176cd7</Path>
<TypeName>EntityDeveloper.EnumTypeMember</TypeName>
</Oid>
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>16</OID>
<Parent>13</Parent>
<OID>17</OID>
<Parent>14</Parent>
</CustomProperties>
<Children />
<Location>
@@ -288,14 +307,14 @@
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID">
<Path>5121abf9-8963-4853-92fc-38b4be002089</Path>
<Path>833a2e4b-3cf7-476c-9a9a-3aeb69315f51</Path>
<TypeName>EntityDeveloper.EnumTypeMember</TypeName>
</Oid>
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>17</OID>
<Parent>13</Parent>
<OID>18</OID>
<Parent>14</Parent>
</CustomProperties>
<Children />
<Location>
@@ -307,56 +326,18 @@
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID">
<Path>9d01dc6b-a794-47f8-ac79-0ff53861181c</Path>
<TypeName>EntityDeveloper.EnumTypeMember</TypeName>
</Oid>
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>18</OID>
<Parent>13</Parent>
</CustomProperties>
<Children />
<Location>
<X>0.5 px</X>
<Y>72.5 px</Y>
</Location>
<Size>
<Width>144 px</Width>
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID">
<Path>b9fd95ad-d147-41df-94c7-3eb0c8eadb90</Path>
<TypeName>EntityDeveloper.EnumTypeMember</TypeName>
</Oid>
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>19</OID>
<Parent>13</Parent>
</CustomProperties>
<Children />
<Location>
<X>0.5 px</X>
<Y>90.5 px</Y>
</Location>
<Size>
<Width>144 px</Width>
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID">
<Path>b61df6d8-6f93-4605-bcb8-40e631176cd7</Path>
<Path>23192dfc-203b-472d-84cb-63a7708d8b67</Path>
<TypeName>EntityDeveloper.EnumTypeMember</TypeName>
</Oid>
</Model>
</Children>
<Size>
<Width>145 px</Width>
<Height>108 px</Height>
<Height>72 px</Height>
</Size>
<MaxSize>
<Width>0 px</Width>
<Height>109 px</Height>
<Height>73 px</Height>
</MaxSize>
</Model>
</Children>
@@ -366,15 +347,15 @@
</Location>
<Size>
<Width>150 px</Width>
<Height>157 px</Height>
<Height>121 px</Height>
</Size>
<MinSize>
<Width>100 px</Width>
<Height>157 px</Height>
<Height>121 px</Height>
</MinSize>
<MaxSize>
<Width>800 px</Width>
<Height>157 px</Height>
<Height>121 px</Height>
</MaxSize>
<Ports />
<Oid xsi:type="SchemaModelOID">
@@ -385,20 +366,20 @@
</Model>
<Model xsi:type="ClassVwModel">
<CustomProperties>
<OID>20</OID>
<OID>19</OID>
<Parent>0</Parent>
</CustomProperties>
<Children>
<Model xsi:type="PropertiesVwModel">
<CustomProperties>
<OID>21</OID>
<Parent>20</Parent>
<OID>20</OID>
<Parent>19</Parent>
</CustomProperties>
<Children>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>22</OID>
<Parent>21</Parent>
<OID>21</OID>
<Parent>20</Parent>
</CustomProperties>
<Children />
<Location>
@@ -416,8 +397,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>23</OID>
<Parent>21</Parent>
<OID>22</OID>
<Parent>20</Parent>
</CustomProperties>
<Children />
<Location>
@@ -435,8 +416,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>24</OID>
<Parent>21</Parent>
<OID>23</OID>
<Parent>20</Parent>
</CustomProperties>
<Children />
<Location>
@@ -454,8 +435,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>25</OID>
<Parent>21</Parent>
<OID>24</OID>
<Parent>20</Parent>
</CustomProperties>
<Children />
<Location>
@@ -473,8 +454,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>26</OID>
<Parent>21</Parent>
<OID>25</OID>
<Parent>20</Parent>
</CustomProperties>
<Children />
<Location>
@@ -492,8 +473,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>27</OID>
<Parent>21</Parent>
<OID>26</OID>
<Parent>20</Parent>
</CustomProperties>
<Children />
<Location>
@@ -521,14 +502,14 @@
</Model>
<Model xsi:type="RelationPropertiesVwModel">
<CustomProperties>
<OID>28</OID>
<Parent>20</Parent>
<OID>27</OID>
<Parent>19</Parent>
</CustomProperties>
<Children>
<Model xsi:type="RelationPropertyVwModel">
<CustomProperties>
<OID>29</OID>
<Parent>28</Parent>
<OID>28</OID>
<Parent>27</Parent>
</CustomProperties>
<Children />
<Size>
@@ -557,8 +538,8 @@
</Model>
</Children>
<Location>
<X>-136 px</X>
<Y>256 px</Y>
<X>-64 px</X>
<Y>216 px</Y>
</Location>
<Size>
<Width>150 px</Width>
@@ -581,20 +562,20 @@
</Model>
<Model xsi:type="ClassVwModel">
<CustomProperties>
<OID>30</OID>
<OID>29</OID>
<Parent>0</Parent>
</CustomProperties>
<Children>
<Model xsi:type="PropertiesVwModel">
<CustomProperties>
<OID>31</OID>
<Parent>30</Parent>
<OID>30</OID>
<Parent>29</Parent>
</CustomProperties>
<Children>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>32</OID>
<Parent>31</Parent>
<OID>31</OID>
<Parent>30</Parent>
</CustomProperties>
<Children />
<Location>
@@ -612,8 +593,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>33</OID>
<Parent>31</Parent>
<OID>32</OID>
<Parent>30</Parent>
</CustomProperties>
<Children />
<Location>
@@ -631,8 +612,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>34</OID>
<Parent>31</Parent>
<OID>33</OID>
<Parent>30</Parent>
</CustomProperties>
<Children />
<Location>
@@ -650,8 +631,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>35</OID>
<Parent>31</Parent>
<OID>34</OID>
<Parent>30</Parent>
</CustomProperties>
<Children />
<Location>
@@ -669,8 +650,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>36</OID>
<Parent>31</Parent>
<OID>35</OID>
<Parent>30</Parent>
</CustomProperties>
<Children />
<Location>
@@ -688,8 +669,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>37</OID>
<Parent>31</Parent>
<OID>36</OID>
<Parent>30</Parent>
</CustomProperties>
<Children />
<Location>
@@ -707,8 +688,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>38</OID>
<Parent>31</Parent>
<OID>37</OID>
<Parent>30</Parent>
</CustomProperties>
<Children />
<Location>
@@ -726,8 +707,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>39</OID>
<Parent>31</Parent>
<OID>38</OID>
<Parent>30</Parent>
</CustomProperties>
<Children />
<Location>
@@ -745,8 +726,8 @@
</Model>
<Model xsi:type="PropertyVwModel">
<CustomProperties>
<OID>40</OID>
<Parent>31</Parent>
<OID>39</OID>
<Parent>30</Parent>
</CustomProperties>
<Children />
<Location>
@@ -774,14 +755,14 @@
</Model>
<Model xsi:type="RelationPropertiesVwModel">
<CustomProperties>
<OID>41</OID>
<Parent>30</Parent>
<OID>40</OID>
<Parent>29</Parent>
</CustomProperties>
<Children>
<Model xsi:type="RelationPropertyVwModel">
<CustomProperties>
<OID>42</OID>
<Parent>41</Parent>
<OID>41</OID>
<Parent>40</Parent>
</CustomProperties>
<Children />
<Size>
@@ -795,8 +776,8 @@
</Model>
<Model xsi:type="RelationPropertyVwModel">
<CustomProperties>
<OID>43</OID>
<Parent>41</Parent>
<OID>42</OID>
<Parent>40</Parent>
</CustomProperties>
<Children />
<Location>
@@ -853,35 +834,35 @@
</Model>
<Model xsi:type="AssociationVwModel">
<CustomProperties>
<OID>44</OID>
<OID>43</OID>
<OutModel>1</OutModel>
<InModel>30</InModel>
<OutPort>45</OutPort>
<InPort>46</InPort>
<InModel>29</InModel>
<OutPort>44</OutPort>
<InPort>45</InPort>
<Parent>0</Parent>
</CustomProperties>
<PortAnchors>
<Port>
<Location>
<X>126 px</X>
<X>42 px</X>
<Y>0 px</Y>
</Location>
<Anchors>Left Right</Anchors>
<Align>Bottom</Align>
<CustomProperties>
<OID>45</OID>
<OID>44</OID>
<PortType>FloatAnchor</PortType>
</CustomProperties>
</Port>
<Port>
<Location>
<X>174 px</X>
<X>130 px</X>
<Y>0 px</Y>
</Location>
<Anchors>Left Right</Anchors>
<Align>Top</Align>
<CustomProperties>
<OID>46</OID>
<OID>45</OID>
<PortType>FloatAnchor</PortType>
</CustomProperties>
</Port>
@@ -894,20 +875,20 @@
</Model>
<Model xsi:type="EnumTypeVwModel">
<CustomProperties>
<OID>47</OID>
<OID>46</OID>
<Parent>0</Parent>
</CustomProperties>
<Children>
<Model xsi:type="PropertiesVwModel">
<CustomProperties>
<OID>48</OID>
<Parent>47</Parent>
<OID>47</OID>
<Parent>46</Parent>
</CustomProperties>
<Children>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>49</OID>
<Parent>48</Parent>
<OID>48</OID>
<Parent>47</Parent>
</CustomProperties>
<Children />
<Location>
@@ -925,8 +906,8 @@
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>50</OID>
<Parent>48</Parent>
<OID>49</OID>
<Parent>47</Parent>
</CustomProperties>
<Children />
<Location>
@@ -944,8 +925,8 @@
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>51</OID>
<Parent>48</Parent>
<OID>50</OID>
<Parent>47</Parent>
</CustomProperties>
<Children />
<Location>
@@ -963,8 +944,8 @@
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>52</OID>
<Parent>48</Parent>
<OID>51</OID>
<Parent>47</Parent>
</CustomProperties>
<Children />
<Location>
@@ -982,8 +963,8 @@
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>53</OID>
<Parent>48</Parent>
<OID>52</OID>
<Parent>47</Parent>
</CustomProperties>
<Children />
<Location>
@@ -1001,8 +982,8 @@
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>54</OID>
<Parent>48</Parent>
<OID>53</OID>
<Parent>47</Parent>
</CustomProperties>
<Children />
<Location>
@@ -1020,8 +1001,8 @@
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>55</OID>
<Parent>48</Parent>
<OID>54</OID>
<Parent>47</Parent>
</CustomProperties>
<Children />
<Location>
@@ -1073,47 +1054,47 @@
</Model>
<Model xsi:type="AssociationVwModel">
<CustomProperties>
<OID>56</OID>
<OutModel>20</OutModel>
<InModel>30</InModel>
<OutPort>57</OutPort>
<InPort>58</InPort>
<OID>55</OID>
<OutModel>19</OutModel>
<InModel>29</InModel>
<OutPort>56</OutPort>
<InPort>57</InPort>
<Parent>0</Parent>
</CustomProperties>
<PortAnchors>
<Port>
<Location>
<X>0 px</X>
<Y>97 px</Y>
<Y>153 px</Y>
</Location>
<Anchors>Top Bottom</Anchors>
<Align>Right</Align>
<CustomProperties>
<OID>57</OID>
<OID>56</OID>
<PortType>FloatAnchor</PortType>
</CustomProperties>
</Port>
<Port>
<Location>
<X>0 px</X>
<Y>108.319587628866 px</Y>
<Y>41 px</Y>
</Location>
<Anchors>Top Bottom</Anchors>
<Align>Left</Align>
<CustomProperties>
<OID>58</OID>
<OID>57</OID>
<PortType>FloatAnchor</PortType>
</CustomProperties>
</Port>
</PortAnchors>
<BendPoints>
<PointD>
<X>34 px</X>
<Y>353 px</Y>
<X>106 px</X>
<Y>369 px</Y>
</PointD>
<PointD>
<X>34 px</X>
<Y>364.319587628866 px</Y>
<X>106 px</X>
<Y>297 px</Y>
</PointD>
</BendPoints>
<IsManuallyRouted>false</IsManuallyRouted>
@@ -1122,6 +1103,128 @@
<TypeName>EntityDeveloper.EntityFrameworkCore.EntityAssociation</TypeName>
</Oid>
</Model>
<Model xsi:type="EnumTypeVwModel">
<CustomProperties>
<OID>58</OID>
<Parent>0</Parent>
</CustomProperties>
<Children>
<Model xsi:type="PropertiesVwModel">
<CustomProperties>
<OID>59</OID>
<Parent>58</Parent>
</CustomProperties>
<Children>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>60</OID>
<Parent>59</Parent>
</CustomProperties>
<Children />
<Location>
<X>0.5 px</X>
<Y>0.5 px</Y>
</Location>
<Size>
<Width>144 px</Width>
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID">
<Path>9ff50531-16aa-4d56-acfa-cb983730f31c</Path>
<TypeName>EntityDeveloper.EnumTypeMember</TypeName>
</Oid>
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>61</OID>
<Parent>59</Parent>
</CustomProperties>
<Children />
<Location>
<X>0.5 px</X>
<Y>18.5 px</Y>
</Location>
<Size>
<Width>144 px</Width>
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID">
<Path>241d5c4f-cd27-424c-bdae-6afbe2cb9f50</Path>
<TypeName>EntityDeveloper.EnumTypeMember</TypeName>
</Oid>
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>62</OID>
<Parent>59</Parent>
</CustomProperties>
<Children />
<Location>
<X>0.5 px</X>
<Y>36.5 px</Y>
</Location>
<Size>
<Width>144 px</Width>
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID">
<Path>a937ae3b-e838-4358-a5f0-a3f9f90c995b</Path>
<TypeName>EntityDeveloper.EnumTypeMember</TypeName>
</Oid>
</Model>
<Model xsi:type="EnumTypeMemberVwModel">
<CustomProperties>
<OID>63</OID>
<Parent>59</Parent>
</CustomProperties>
<Children />
<Location>
<X>0.5 px</X>
<Y>54.5 px</Y>
</Location>
<Size>
<Width>144 px</Width>
<Height>18 px</Height>
</Size>
<Oid xsi:type="SchemaModelOID">
<Path>9b51d8d2-0901-4bee-aa6a-c62a0508b7c0</Path>
<TypeName>EntityDeveloper.EnumTypeMember</TypeName>
</Oid>
</Model>
</Children>
<Size>
<Width>145 px</Width>
<Height>72 px</Height>
</Size>
<MaxSize>
<Width>0 px</Width>
<Height>73 px</Height>
</MaxSize>
</Model>
</Children>
<Location>
<X>40 px</X>
<Y>-160 px</Y>
</Location>
<Size>
<Width>150 px</Width>
<Height>121 px</Height>
</Size>
<MinSize>
<Width>100 px</Width>
<Height>121 px</Height>
</MinSize>
<MaxSize>
<Width>800 px</Width>
<Height>121 px</Height>
</MaxSize>
<Ports />
<Oid xsi:type="SchemaModelOID">
<Path>01b07848-c72f-4d42-bdf5-6581d9c5de33</Path>
<TypeName>EntityDeveloper.EntityFrameworkCore.EntityEnumType</TypeName>
</Oid>
<FixedHeight>22 px</FixedHeight>
</Model>
</Children>
<GridSize>8 px</GridSize>
<ViewPort>

19
FSSiegen.efml
View File

@@ -2,12 +2,10 @@
<efcore context-namespace="FoodsharingSiegen.Server.Data" namespace="FoodsharingSiegen.Contracts.Entity" p1:name="FsContext" p1:Guid="92949983-e236-4233-8714-eeb3a8372740" xmlns:p1="http://devart.com/schemas/EntityDeveloper/1.0">
<class name="$EnumTypes">
<EnumType Name="UserType" class="UserType" p1:Guid="b1301985-6d27-413f-9f9e-ebbdfc49bbc1">
<Member Name="Unverified" Value="0" p1:Guid="b046051e-682a-45ca-8471-d9c55c09ed59" />
<Member Name="ReadOnly" Value="10" p1:Guid="fbcf22ae-d06c-4ef4-9375-7da0116c1756" />
<Member Name="WelcomeTeam" Value="20" p1:Guid="5121abf9-8963-4853-92fc-38b4be002089" />
<Member Name="StoreManager" Value="30" p1:Guid="9d01dc6b-a794-47f8-ac79-0ff53861181c" />
<Member Name="Ambassador" Value="40" p1:Guid="b9fd95ad-d147-41df-94c7-3eb0c8eadb90" />
<Member Name="Admin" Value="50" p1:Guid="b61df6d8-6f93-4605-bcb8-40e631176cd7" />
<Member Name="Unverified" Value="100" p1:Guid="b046051e-682a-45ca-8471-d9c55c09ed59" />
<Member Name="User" Value="200" p1:Guid="b61df6d8-6f93-4605-bcb8-40e631176cd7" />
<Member Name="Admin" Value="300" p1:Guid="833a2e4b-3cf7-476c-9a9a-3aeb69315f51" />
<Member Name="nix" Value="50" p1:Guid="23192dfc-203b-472d-84cb-63a7708d8b67" />
</EnumType>
<EnumType Name="InteractionType" class="InteractionType" p1:Guid="93f9359f-3deb-4dbe-9a8b-b8949f833919">
<Member Name="EinAb" Value="10" p1:Guid="f2ad51e2-93c8-4c70-8620-b3f9fc8fe484" />
@@ -18,6 +16,12 @@
<Member Name="Verify" Value="60" p1:Guid="21fa1cd1-2e3c-4a85-bd1b-5780549d0835" />
<Member Name="Complete" Value="70" p1:Guid="4c471e6c-91e8-489e-8a3d-41bee5acf5e3" />
</EnumType>
<EnumType Name="UserGroup" class="UserGroup" p1:Guid="01b07848-c72f-4d42-bdf5-6581d9c5de33">
<Member Name="ReadOnly" Value="100" p1:Guid="9ff50531-16aa-4d56-acfa-cb983730f31c" />
<Member Name="WelcomeTeam" Value="200" p1:Guid="241d5c4f-cd27-424c-bdae-6afbe2cb9f50" />
<Member Name="StoreManager" Value="300" p1:Guid="a937ae3b-e838-4358-a5f0-a3f9f90c995b" />
<Member Name="Ambassador" Value="400" p1:Guid="9b51d8d2-0901-4bee-aa6a-c62a0508b7c0" />
</EnumType>
</class>
<class name="User" entity-set="Users" p1:Guid="f956d4e9-7523-4b77-96be-10cbe0cc6929">
<id name="Id" type="Guid" value-generated="OnAdd" p1:ValidateRequired="true" p1:Guid="ba4bfd64-dca0-4716-beff-1c571eb08665">
@@ -41,6 +45,9 @@
<property name="EncryptedPassword" type="String" p1:ValidateRequired="true" p1:Guid="0e030886-d23e-4293-aeea-86f0a5c53d4e">
<column name="" />
</property>
<property name="Groups" type="String" p1:ValidateRequired="true" p1:Guid="bf41429c-3b00-4d34-9851-bf35a3649fd2">
<column name="" />
</property>
</class>
<class name="Prospect" entity-set="Prospects" p1:Guid="2f24182f-047a-4dba-a926-ddb2044ce3a3">
<id name="Id" type="Guid" value-generated="OnAdd" p1:ValidateRequired="true" p1:Guid="be4ea414-f058-4b82-ab45-43750869702c">

2
FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code.
//------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 04.04.2022 16:38:40
// Code is generated on: 05.04.2022 16:38:00
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

2
FoodsharingSiegen.Contracts/Entity/InteractionType.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code.
//------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 04.04.2022 16:38:40
// Code is generated on: 05.04.2022 16:38:00
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

2
FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code.
//------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 04.04.2022 16:38:40
// Code is generated on: 05.04.2022 16:38:00
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

4
FoodsharingSiegen.Contracts/Entity/User.Generated.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code.
//------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 04.04.2022 16:38:40
// Code is generated on: 05.04.2022 16:38:00
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -40,6 +40,8 @@ namespace FoodsharingSiegen.Contracts.Entity
public virtual string EncryptedPassword { get; set; }
public virtual string Groups { get; set; }
public virtual IList<Interaction> Interactions { get; set; }
#region Extensibility Method Definitions

35
FoodsharingSiegen.Contracts/Entity/User.cs
View File

@@ -1,23 +1,42 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations.Schema;
using System.Data;
using System.Data.Common;
using System.Linq;
using System.Linq.Expressions;
using FoodsharingSiegen.Shared.Helper;
namespace FoodsharingSiegen.Contracts.Entity
{
/// <summary>
/// The user class (a. beging, 06.04.2022)
/// </summary>
public partial class User
{
#region Public Properties
/// <summary>
/// Gets or sets the value of the groups list (ab)
/// </summary>
[NotMapped]
public List<UserGroup> GroupsList
{
get
{
if (string.IsNullOrWhiteSpace(Groups)) return new List<UserGroup>();
var stringList = Groups.Split(",");
var enumList = stringList.Where(x => !string.IsNullOrWhiteSpace(x)).Select(Enum.Parse<UserGroup>).ToList();
return enumList;
}
set => Groups = string.Join(",", value);
}
/// <summary>
/// Gets or sets the value of the password (ab)
/// </summary>
[NotMapped]
public string Password
{
get => AuthHelper.Decrypt(EncryptedPassword);
get => AuthHelper.TryDecrypt(EncryptedPassword, out var password) ? password : string.Empty;
set => EncryptedPassword = AuthHelper.Encrypt(value);
}
#endregion
}
}

28
FoodsharingSiegen.Contracts/Entity/UserGroup.cs Normal file
View File

@@ -0,0 +1,28 @@
//------------------------------------------------------------------------------
// This is auto-generated code.
//------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 05.04.2022 16:38:00
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
//------------------------------------------------------------------------------
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Data.Common;
using System.Linq;
using System.Linq.Expressions;
namespace FoodsharingSiegen.Contracts.Entity
{
public enum UserGroup : int
{
ReadOnly = 100,
WelcomeTeam = 200,
StoreManager = 300,
Ambassador = 400
}
}

12
FoodsharingSiegen.Contracts/Entity/UserType.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code.
//------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 04.04.2022 16:38:40
// Code is generated on: 05.04.2022 16:38:00
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -20,11 +20,9 @@ namespace FoodsharingSiegen.Contracts.Entity
{
public enum UserType : int
{
Unverified = 0,
ReadOnly = 10,
WelcomeTeam = 20,
StoreManager = 30,
Ambassador = 40,
Admin = 50
Unverified = 100,
User = 200,
Admin = 300,
nix = 50
}
}

3
FoodsharingSiegen.Server/Data/FsContext.Generated.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code.
//------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 04.04.2022 16:38:40
// Code is generated on: 05.04.2022 16:38:00
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -101,6 +101,7 @@ namespace FoodsharingSiegen.Server.Data
modelBuilder.Entity<User>().Property(x => x.Name).HasColumnName(@"Name").IsRequired().ValueGeneratedNever();
modelBuilder.Entity<User>().Property(x => x.Created).HasColumnName(@"Created").IsRequired().ValueGeneratedNever();
modelBuilder.Entity<User>().Property(x => x.EncryptedPassword).HasColumnName(@"EncryptedPassword").IsRequired().ValueGeneratedNever();
modelBuilder.Entity<User>().Property(x => x.Groups).HasColumnName(@"Groups").IsRequired().ValueGeneratedNever();
modelBuilder.Entity<User>().HasKey(@"Id");
}

1
FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj
View File

@@ -13,6 +13,7 @@
<ItemGroup>
<PackageReference Include="Blazorise.DataGrid" Version="1.0.2" />
<PackageReference Include="Blazorise.Icons.Material" Version="1.0.2" />
<PackageReference Include="Blazorise.Components" Version="1.0.2" />
<PackageReference Include="Blazorise.Material" Version="1.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">

178
FoodsharingSiegen.Server/Migrations/20220405143853_usergroups.Designer.cs generated Normal file
View File

@@ -0,0 +1,178 @@
// <auto-generated />
using System;
using FoodsharingSiegen.Server.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace FoodsharingSiegen.Server.Migrations
{
[DbContext(typeof(FsContext))]
[Migration("20220405143853_usergroups")]
partial class usergroups
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "6.0.1");
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Interaction", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("TEXT")
.HasColumnName("Id");
b.Property<bool>("Alert")
.HasColumnType("INTEGER")
.HasColumnName("Alert");
b.Property<DateTime>("Created")
.HasColumnType("TEXT")
.HasColumnName("Created");
b.Property<DateTime>("Date")
.HasColumnType("TEXT")
.HasColumnName("Date");
b.Property<string>("Info")
.HasColumnType("TEXT")
.HasColumnName("Info");
b.Property<bool>("NotNeeded")
.HasColumnType("INTEGER")
.HasColumnName("NotNeeded");
b.Property<Guid>("ProspectId")
.HasColumnType("TEXT")
.HasColumnName("ProspectId");
b.Property<int>("Type")
.HasColumnType("INTEGER")
.HasColumnName("Type");
b.Property<Guid>("UserId")
.HasColumnType("TEXT")
.HasColumnName("UserId");
b.HasKey("Id");
b.HasIndex("ProspectId");
b.HasIndex("UserId");
b.ToTable("Interactions", (string)null);
});
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Prospect", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("TEXT")
.HasColumnName("Id");
b.Property<DateTime>("Created")
.HasColumnType("TEXT")
.HasColumnName("Created");
b.Property<int>("FsId")
.HasColumnType("INTEGER")
.HasColumnName("FsId");
b.Property<string>("Memo")
.HasColumnType("TEXT")
.HasColumnName("Memo");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("Name");
b.Property<Guid>("ProgressId")
.HasColumnType("TEXT")
.HasColumnName("ProgressId");
b.HasKey("Id");
b.ToTable("Prospects", (string)null);
});
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.User", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("TEXT")
.HasColumnName("Id");
b.Property<DateTime>("Created")
.HasColumnType("TEXT")
.HasColumnName("Created");
b.Property<string>("EncryptedPassword")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("EncryptedPassword");
b.Property<string>("Groups")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("Groups");
b.Property<string>("Mail")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("Mail");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("Name");
b.Property<int>("Type")
.HasColumnType("INTEGER")
.HasColumnName("Type");
b.Property<bool>("Verified")
.HasColumnType("INTEGER")
.HasColumnName("Verified");
b.HasKey("Id");
b.ToTable("Users", (string)null);
});
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Interaction", b =>
{
b.HasOne("FoodsharingSiegen.Contracts.Entity.Prospect", "Prospect")
.WithMany("Interactions")
.HasForeignKey("ProspectId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("FoodsharingSiegen.Contracts.Entity.User", "User")
.WithMany("Interactions")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Prospect");
b.Navigation("User");
});
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Prospect", b =>
{
b.Navigation("Interactions");
});
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.User", b =>
{
b.Navigation("Interactions");
});
#pragma warning restore 612, 618
}
}
}

26
FoodsharingSiegen.Server/Migrations/20220405143853_usergroups.cs Normal file
View File

@@ -0,0 +1,26 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace FoodsharingSiegen.Server.Migrations
{
public partial class usergroups : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "Groups",
table: "Users",
type: "TEXT",
nullable: false,
defaultValue: "");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "Groups",
table: "Users");
}
}
}

5
FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs
View File

@@ -114,6 +114,11 @@ namespace FoodsharingSiegen.Server.Migrations
.HasColumnType("TEXT")
.HasColumnName("EncryptedPassword");
b.Property<string>("Groups")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("Groups");
b.Property<string>("Mail")
.IsRequired()
.HasColumnType("TEXT")

35
FoodsharingSiegen.Server/Pages/Users.razor.cs
View File

@@ -37,6 +37,14 @@ namespace FoodsharingSiegen.Server.Pages
/// </summary>
private List<User>? UserList { get; set; }
public User? SelectedUser { get; set; }
public IEnumerable<UserGroup> UserGroups => Enum.GetValues<UserGroup>();
public List<Company> Companies { get; set; }
public List<UserGroup> SelectedCompanies { get; set; }
public List<string> SelectedCompanyTexts { get; set; } = new();
#endregion
#region Override OnAfterRenderAsync
@@ -55,6 +63,21 @@ namespace FoodsharingSiegen.Server.Pages
#endregion
protected override void OnInitialized()
{
Companies = new List<Company>
{
new Company{Name = "Germany", ISO = "DE"},
new Company{Name = "USA", ISO = "US"},
new Company{Name = "England", ISO = "GB"},
new Company{Name = "Austria", ISO = "AT"}
};
SelectedCompanies = new List<UserGroup> {UserGroups.ElementAt(2)};
base.OnInitialized();
}
#region Private Method Chang
/// <summary>
@@ -119,5 +142,17 @@ namespace FoodsharingSiegen.Server.Pages
}
#endregion
private async Task SelectedChanged(List<UserGroup> arg)
{
}
}
public class Company
{
public string Name { get; set; }
public string ISO { get; set; }
}
}