YKI(Frontend): Update fixtures and serialization logic [deploy]

Opetushallitus · Dec 28, 2023 · 634f3d2 · 634f3d2
1 parent dab4073
commit 634f3d2
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 39 deletions.
diff --git a/frontend/packages/yki/dev/rest/examSessions/allExamSessions.json b/frontend/packages/yki/dev/rest/examSessions/allExamSessions.json
@@ -46,7 +46,7 @@
           "zip": "00100"
         }
       ],
-      "exam_fee": "100.00",
+      "exam_fee": 200,
       "registration_end_date": "2023-01-03",
       "open": true,
       "queue_full": false,
@@ -102,7 +102,7 @@
           "zip": "00100"
         }
       ],
-      "exam_fee": "100.00",
+      "exam_fee": 200,
       "registration_end_date": "2023-01-03",
       "open": true,
       "queue_full": false,
@@ -158,7 +158,7 @@
           "zip": "00100"
         }
       ],
-      "exam_fee": "100.00",
+      "exam_fee": 200,
       "registration_end_date": "2039-12-10",
       "open": true,
       "queue_full": false,
@@ -214,7 +214,7 @@
           "zip": "00100"
         }
       ],
-      "exam_fee": "100.00",
+      "exam_fee": 153,
       "registration_end_date": "2039-12-14",
       "open": false,
       "queue_full": false,
@@ -269,7 +269,7 @@
           "zip": "00100"
         }
       ],
-      "exam_fee": "123.00",
+      "exam_fee": 176,
       "registration_end_date": "2039-02-28",
       "open": true,
       "queue_full": false,
@@ -324,7 +324,7 @@
           "zip": "00100"
         }
       ],
-      "exam_fee": "123.00",
+      "exam_fee": 153,
       "registration_end_date": "2039-02-28",
       "open": true,
       "queue_full": true,
@@ -377,7 +377,7 @@
           "zip": "40100"
         }
       ],
-      "exam_fee": "100.00",
+      "exam_fee": 176,
       "registration_end_date": "2039-02-28",
       "open": true,
       "queue_full": false,
@@ -430,7 +430,7 @@
           "zip": "40100"
         }
       ],
-      "exam_fee": "160.00",
+      "exam_fee": 200,
       "registration_end_date": "2029-02-28",
       "open": true,
       "queue_full": false,
@@ -482,7 +482,7 @@
           "zip": "40100"
         }
       ],
-      "exam_fee": "100.00",
+      "exam_fee": 153,
       "registration_end_date": "2039-02-28",
       "open": true,
       "queue_full": false,
@@ -534,7 +534,7 @@
           "zip": "00250"
         }
       ],
-      "exam_fee": "100.00",
+      "exam_fee": 153,
       "registration_end_date": "2039-02-28",
       "open": true,
       "queue_full": true,
@@ -588,7 +588,7 @@
           "zip": "00250"
         }
       ],
-      "exam_fee": "123.00",
+      "exam_fee": 176,
       "registration_end_date": "2020-12-02",
       "open": true,
       "queue_full": true,

diff --git a/frontend/packages/yki/dev/rest/examSessions/examSessions.json b/frontend/packages/yki/dev/rest/examSessions/examSessions.json
@@ -47,7 +47,7 @@
       "organizer_oid": "1.2.3.4",
       "language_code": "eng",
       "level_code": "KESKI",
-      "exam_fee": "100.00",
+      "exam_fee": 176,
       "open": true,
       "queue": 0,
       "queue_full": false,
@@ -103,7 +103,7 @@
       "organizer_oid": "1.2.3.4",
       "language_code": "eng",
       "level_code": "KESKI",
-      "exam_fee": "100.00",
+      "exam_fee": 176,
       "open": false,
       "queue": 0,
       "queue_full": false,
@@ -159,7 +159,7 @@
       "organizer_oid": "1.2.3.4",
       "language_code": "fin",
       "level_code": "PERUS",
-      "exam_fee": "100.00",
+      "exam_fee": 153,
       "open": false,
       "queue": 1,
       "queue_full": false,
@@ -215,7 +215,7 @@
       "organizer_oid": "1.2.3.4",
       "language_code": "fin",
       "level_code": "KESKI",
-      "exam_fee": "100.00",
+      "exam_fee": 176,
       "open": false,
       "queue": 0,
       "queue_full": false,
@@ -272,7 +272,7 @@
       "organizer_oid": "1.2.3.4",
       "language_code": "fin",
       "level_code": "YLIN",
-      "exam_fee": "100.00",
+      "exam_fee": 200,
       "open": false,
       "queue": 0,
       "queue_full": false,
@@ -329,7 +329,7 @@
       "organizer_oid": "1.2.3.4",
       "language_code": "eng",
       "level_code": "KESKI",
-      "exam_fee": "100.00",
+      "exam_fee": 176,
       "open": true,
       "queue": 0,
       "queue_full": false,

diff --git a/frontend/packages/yki/dev/rest/registration/prices.json b/frontend/packages/yki/dev/rest/registration/prices.json
@@ -1,13 +1,13 @@
 {
     "exam-prices": {
-        "PERUS": "120.00",
-        "KESKI": "140.00",
-        "YLIN": "180.00"
+        "PERUS": 153,
+        "KESKI": 176,
+        "YLIN": 200
     },
     "evaluation-prices": {
-        "READING": "50.00",
-        "LISTENING": "50.00",
-        "WRITING": "50.00",
-        "SPEAKING": "50.00"
+        "READING": 50,
+        "LISTENING": 50,
+        "WRITING": 50,
+        "SPEAKING": 50
     }
 }
diff --git a/frontend/packages/yki/dev/rest/registration/registrationInit.json b/frontend/packages/yki/dev/rest/registration/registrationInit.json
@@ -40,7 +40,7 @@
         "lang": "en"
       }
     ],
-    "exam_fee": "100.00"
+    "exam_fee": 153
   },
   "user": {
     "last_name": "Parkkonen-Testi",

diff --git a/frontend/packages/yki/dev/rest/registration/registrationInitEmailAuth.json b/frontend/packages/yki/dev/rest/registration/registrationInitEmailAuth.json
@@ -40,7 +40,7 @@
         "lang": "en"
       }
     ],
-    "exam_fee": "100.00"
+    "exam_fee": 176
   },
   "user": {
     "email": "[email protected]"

diff --git a/frontend/packages/yki/src/interfaces/examSessions.ts b/frontend/packages/yki/src/interfaces/examSessions.ts
@@ -28,14 +28,12 @@ export interface ExamSessionResponse
     | 'post_admission_end_date'
     | 'registration_start_date'
     | 'registration_end_date'
-    | 'exam_fee'
   > {
   session_date: string;
   post_admission_start_date?: string;
   post_admission_end_date?: string;
   registration_start_date?: string;
   registration_end_date?: string;
-  exam_fee?: string;
 }
 
 export interface ExamSessionLocation {

diff --git a/frontend/packages/yki/src/tests/msw/fixtures/examSession.ts b/frontend/packages/yki/src/tests/msw/fixtures/examSession.ts
@@ -46,7 +46,7 @@ export const examSessions = {
           zip: '00100',
         },
       ],
-      exam_fee: '100.00',
+      exam_fee: 200,
       registration_end_date: '2023-01-03',
       open: true,
       queue_full: false,
@@ -102,7 +102,7 @@ export const examSessions = {
           zip: '00100',
         },
       ],
-      exam_fee: '100.00',
+      exam_fee: 200,
       registration_end_date: '2023-01-03',
       open: true,
       queue_full: false,
@@ -158,7 +158,7 @@ export const examSessions = {
           zip: '00100',
         },
       ],
-      exam_fee: '100.00',
+      exam_fee: 200,
       registration_end_date: '2039-12-10',
       open: true,
       queue_full: false,
@@ -214,7 +214,7 @@ export const examSessions = {
           zip: '00100',
         },
       ],
-      exam_fee: '100.00',
+      exam_fee: 153,
       registration_end_date: '2039-12-14',
       open: false,
       queue_full: false,
@@ -269,7 +269,7 @@ export const examSessions = {
           zip: '00100',
         },
       ],
-      exam_fee: '123.00',
+      exam_fee: 176,
       registration_end_date: '2039-02-28',
       open: true,
       queue_full: false,
@@ -322,7 +322,7 @@ export const examSessions = {
           zip: '40100',
         },
       ],
-      exam_fee: '100.00',
+      exam_fee: 176,
       registration_end_date: '2039-02-28',
       open: true,
       queue_full: false,
@@ -375,7 +375,7 @@ export const examSessions = {
           zip: '40100',
         },
       ],
-      exam_fee: '160.00',
+      exam_fee: 200,
       registration_end_date: '2029-02-28',
       open: true,
       queue_full: false,
@@ -427,7 +427,7 @@ export const examSessions = {
           zip: '40100',
         },
       ],
-      exam_fee: '100.00',
+      exam_fee: 153,
       registration_end_date: '2039-02-28',
       open: true,
       queue_full: false,
@@ -479,7 +479,7 @@ export const examSessions = {
           zip: '00250',
         },
       ],
-      exam_fee: '100.00',
+      exam_fee: 153,
       registration_end_date: '2039-02-28',
       open: true,
       queue_full: true,
@@ -533,7 +533,7 @@ export const examSessions = {
           zip: '00250',
         },
       ],
-      exam_fee: '123.00',
+      exam_fee: 176,
       registration_end_date: '2020-12-02',
       open: true,
       queue_full: true,

diff --git a/frontend/packages/yki/src/utils/serialization.ts b/frontend/packages/yki/src/utils/serialization.ts
@@ -66,7 +66,6 @@ export class SerializationUtils {
       registration_end_date: SerializationUtils.deserializeEndTime(
         examSessionResponse.registration_end_date
       ) as Dayjs,
-      exam_fee: parseInt(examSessionResponse.exam_fee as string),
     };
   }