Merge pull request #25 from Clm-Roig/23-add-id-to-data-using-uuid-v

23 Add id to data using UUID v4

.github/workflows/build_test.yml

@@ -5,9 +5,9 @@ name: Build & test
 
 on:
   push:
-    branches: [ develop ]
   pull_request:
-    branches: [ develop ]
+    branches: 
+      - develop
 
 jobs:
   build_and_test:

package.json

@@ -17,13 +17,15 @@
     "@types/react": "^16.14.24",
     "@types/react-dom": "^16.9.14",
     "@types/react-redux": "^7.1.23",
+    "@types/uuid": "^8.3.4",
     "date-fns": "^2.28.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-redux": "^7.2.6",
     "react-router-dom": "^6.2.2",
     "react-scripts": "5.0.0",
-    "typescript": "~4.1.5"
+    "typescript": "~4.1.5",
+    "uuid": "^8.3.2"
   },
   "scripts": {
     "start": "react-scripts start",

src/components/TrackerCard/TrackerCard.spec.tsx

@@ -3,8 +3,10 @@ import { subDays } from 'date-fns';
 import TrackerStatus from '../../models/TrackerStatus';
 import formatDate from '../../utils/formatDate';
 import TrackerCard from './TrackerCard';
+import { v4 } from 'uuid';
 
 const tracker1 = {
+  id: v4(),
   beginDate: subDays(new Date(), 3).toString(),
   defaultQuantity: 15,
   duration: 13,

src/models/Tracker.ts

@@ -1,6 +1,7 @@
 import TrackerEntry from './TrackerEntry';
 import TrackerStatus from './TrackerStatus';
 export default interface Tracker {
+  id: string; // uuid v4
   beginDate: string;
   dateHidden?: string;
   defaultQuantity?: number;

src/models/TrackerEntry.ts

@@ -1,4 +1,5 @@
 export default interface TrackerEntry {
+  id: string; // uuid v4
   date: string;
   quantity: number;
 }

src/store/trackers/trackers.actions.ts

@@ -1,6 +1,7 @@
 import { subDays } from 'date-fns';
 import Tracker from '../../models/Tracker';
 import TrackerStatus from '../../models/TrackerStatus';
+import { v4 as uuidv4 } from 'uuid';
 
 class TrackersActions {
   // A mock function to mimic making an async request for data
@@ -11,6 +12,7 @@ class TrackersActions {
           resolve({
             data: [
               {
+                id: uuidv4(),
                 beginDate: new Date().toString(),
                 name: "Boire plus d'eau",
                 defaultQuantity: 1,
@@ -19,6 +21,7 @@ class TrackersActions {
                 entries: []
               },
               {
+                id: uuidv4(),
                 beginDate: new Date().toString(),
                 defaultQuantity: 1,
                 name: 'Faire du yoga',
@@ -27,6 +30,7 @@ class TrackersActions {
                 entries: []
               },
               {
+                id: uuidv4(),
                 beginDate: subDays(new Date(), 7).toString(),
                 defaultQuantity: 15,
                 duration: 45,

src/store/trackers/trackers.selectors.spec.ts

@@ -1,3 +1,4 @@
+import { v4 } from 'uuid';
 import SliceStatus from '../../models/SliceStatus';
 import Tracker from '../../models/Tracker';
 import TrackerStatus from '../../models/TrackerStatus';
@@ -18,6 +19,7 @@ describe('trackers selector', () => {
         ...state.trackers,
         trackers: [
           {
+            id: v4(),
             beginDate: new Date().toString(),
             entries: [],
             name: 'Do',
@@ -26,6 +28,7 @@ describe('trackers selector', () => {
             unit: 'push-ups'
           },
           {
+            id: v4(),
             beginDate: new Date().toString(),
             duration: 10,
             entries: [],