Split Name field into Surname and Forename

In this commit, the `Name` field in various classes and functions across multiple files (`Entity.cs`, `Info.tsx`, `Setting.tsx`, `Persona.tsx`, `Get.ts`, `Entity.ts`) has been replaced with `Surname` and `Forename` fields. This change in the data structure splits the name into two separate fields.

In `Entity.cs`, an `Include` statement has been added to include the `User` in the query result when fetching comments. The display of the name in the `Label` and `ToastBody` components in `Info.tsx` and `Setting.tsx` has been updated to display the `Surname` followed by the `Forename`.

In `Get.ts`, the `User` field in the `AdminOrderGet` class and the `Name` field in the `AdminUserGet` class have been replaced with `Forename`. The `name` variable in the `OrderGet` class is now assigned the value of `user.Forename` instead of `user.Name`.

Finally, in `Entity.ts`, the `AdminUserEntity` class has been updated to version `0.2.0` and the `Name` field has been replaced with `Surname` and `Forename`.

SoarCraft.AwaiShop/Hub/Order/Entity.cs

@@ -49,6 +49,7 @@ public async Task<dynamic> OrderEntity(uint key, uint? version) {
 
         return await this.Db.Comments
             .Where(x => x.CommentId == key && x.Order.UserId == this.UserId)
+            .Include(x => x.User)
             .Select(x => new {
                 x.Content,
                 x.User!.Forename,

src/Components/Order/Info.tsx

@@ -52,7 +52,7 @@ export function OrderInfo({ OrderId, Admin, ParentLog }: IOrderComp) {
     <div className={style.flex}>
       <div className={style.box}>
         <Field label="Name" size="large">
-          <Label>{data?.Name}</Label>
+          <Label>{data?.Surname}, {data?.Forename}</Label>
         </Field>
       </div>
 

src/Components/Setting.tsx

@@ -85,7 +85,7 @@ export function Setting({ Open, Toggle, New }: ISetting) {
         <Toast>
           <ToastTitle>Info {New ? "Created" : "Updated"}</ToastTitle>
           <ToastBody>
-            {req.Name}
+            {req.Surname}, {req.Forename}
             <br />
             {req.Phone}
             <br />

src/Components/ShopCart/Persona.tsx

@@ -24,7 +24,6 @@ const useStyles = makeStyles({
  * @version 0.2.0
  */
 export interface IPersona {
-  Name: string;
   Surname: string;
   Forename: string;
   Phone: string;

src/ShopNet/Admin/Order/Get.ts

@@ -79,7 +79,7 @@ export abstract class AdminOrderGet extends AdminNet {
         Status: order.Status,
         TrackNumber: order.TrackingNumber,
         OrderDate: order.CreateAt,
-        User: user.Name,
+        User: user.Forename,
       });
     }
 

src/ShopNet/Admin/User/Entity.ts

@@ -10,15 +10,16 @@ export abstract class AdminUserEntity extends AdminNet {
   /**
    * @author Aloento
    * @since 1.0.0
-   * @version 0.1.0
+   * @version 0.2.0
    */
   public static User(key: string): Promise<({
-    Name: string;
+    Surname: string;
+    Forename: string;
     EMail: string;
     Phone: string;
     Address: string;
     Admin?: boolean;
-  } & IConcurrency) | void> {
+  } & IConcurrency)> {
     this.EnsureLogin();
     return this.GetVersionCache(key, "UserEntity");
   }

src/ShopNet/Admin/User/Get.ts

@@ -48,7 +48,7 @@ export abstract class AdminUserGet extends AdminNet {
 
       res.push({
         Id: userId,
-        Name: user.Name,
+        Name: `${user.Surname}, ${user.Forename}`,
         EMail: user.EMail,
         Admin: user.Admin,
       });

src/ShopNet/Order/Get.ts

@@ -206,7 +206,7 @@ export abstract class OrderGet extends OrderEntity {
             const user = await AdminUserEntity.User(cmt.UserId);
 
             if (user)
-              name = user.Name;
+              name = user.Forename;
             else
               log.warn(`[Mismatch] User ${cmt.UserId} not found. Order : ${orderId}`);
           }