Update template-utils.ts

mshima · Nov 4, 2024 · 11a4617 · 11a4617
1 parent 0bcccaf
commit 11a4617
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/generators/client/support/template-utils.ts b/generators/client/support/template-utils.ts
@@ -130,16 +130,18 @@ export const generateTsTestEntityForFields = (
 ): Record<string, string | number | boolean> => {
   const entries = fields
     .map(field => {
-      const { fieldWithContentType, contentTypeFieldName } = field;
-      if (index === 'random') {
-        if (fieldWithContentType) {
+      const { fieldWithContentType, contentTypeFieldName, fieldTypeTimed, fieldTypeLocalDate } = field;
+      const fakeData = field.generateFakeData!('ts');
+      if (fieldWithContentType) {
           return [
-            [field.propertyName, field.generateFakeData!('ts')],
+            [field.propertyName, fakeData],
             [contentTypeFieldName, 'unknown'],
           ];
         }
-      }
-      return [[field.propertyName, field.generateFakeData!('ts')]];
+        if (fieldTypeTimed || fieldTypeLocalDate) {
+          return [[field.propertyName, `dayjs(${fakeData})`]];
+        }
+      return [[field.propertyName, fakeData]];
     })
     .flat();
   return Object.fromEntries(entries);
@@ -166,17 +168,14 @@ export const generateTestEntity = (references, index: 0 | 1 | 'random' = 'random
     .map(reference => {
       if (index === 'random') {
         const field = reference.field;
-        const { fieldWithContentType, contentTypeFieldName, fieldTypeTimed, fieldTypeLocalDate } = field;
+        const { fieldWithContentType, contentTypeFieldName } = field;
         const fakeData = field.generateFakeData('json-serializable');
         if (fieldWithContentType) {
           return [
             [reference.name, fakeData],
             [contentTypeFieldName, 'unknown'],
           ];
         }
-        if (fieldTypeTimed || fieldTypeLocalDate) {
-          return [[fieldName, `dayjs(${fakeData})`]];
-        }
         return [[reference.name, fakeData]];
       }
       return [[reference.name, generateTestEntityId(reference.type, index, false)]];