Feature/#230 experience and studies sorted by date

packages/manfred-common/src/doc-parts/experience-section/experience-section.helpers.ts

@@ -0,0 +1,15 @@
+import { ExperienceVm } from './experience-section.vm';
+import { dateExtractor, sortByDate } from '../../helpers';
+
+export const sortRolesByDate = (experience: ExperienceVm): ExperienceVm => ({
+  ...experience,
+  roles: sortByDate(experience.roles, 'startDate'),
+});
+
+export const mapSortedRolesIntoExperience = (experience: ExperienceVm[]): ExperienceVm[] =>
+  experience.map(experienceItem => sortRolesByDate(experienceItem));
+
+export const sortExperienceByDate = (experience: ExperienceVm[]): ExperienceVm[] =>
+  experience.sort(
+    (a: ExperienceVm, b) => dateExtractor(b.roles[0], 'startDate') - dateExtractor(a.roles[0], 'startDate')
+  );

packages/manfred-common/src/doc-parts/experience-section/experience-section.mapper.ts

@@ -1,6 +1,7 @@
 import { ManfredAwesomicCV } from '../../model';
 import { ExperienceVm, Type } from './experience-section.vm';
 import { types } from './experience-section.contants';
+import { mapSortedRolesIntoExperience, sortExperienceByDate } from './experience-section.helpers';
 
 export const mapFromMacCvToExperienceSectionVm = (cv: ManfredAwesomicCV): ExperienceVm[] => {
   let jobs: ExperienceVm[] = [];
@@ -16,7 +17,10 @@ export const mapFromMacCvToExperienceSectionVm = (cv: ManfredAwesomicCV): Experi
     jobs = [...jobs, { name: organizationName, description: organizationDescription, type: mapType, roles }];
   });
 
-  return jobs;
+  const jobsWithMappedRoles: ExperienceVm[] = mapSortedRolesIntoExperience(jobs);
+  const jobsSortedByDate: ExperienceVm[] = sortExperienceByDate(jobsWithMappedRoles);
+
+  return jobsSortedByDate;
 };
 
 export const mapOrganizationType = (type: string, types: Type[]): string => {

packages/manfred-common/src/doc-parts/studies-section/studies-section.helpers.spec.ts

@@ -0,0 +1,243 @@
+import { sortStudiesByDate } from './studies-section.helpers';
+import { StudiesSectionVm } from './studies-section.vm';
+
+describe('studies-section.helpers specs', () => {
+  describe('sortStudiesByDate', () => {
+    it('should return studies section sorted by starting date', () => {
+      // Arrange
+      const studies: StudiesSectionVm[] = [
+        {
+          studyType: 'Certificación',
+          degreeAchieved: true,
+          name: 'name2',
+          startDate: '2020-12-03',
+          finishDate: '2022-07-08',
+          description: 'description2',
+          institution: {
+            name: 'name2',
+            location: {
+              country: 'Italia',
+              region: 'region2',
+              address: 'address2',
+            },
+          },
+        },
+        {
+          studyType: 'Certificación',
+          degreeAchieved: true,
+          name: 'name2',
+          startDate: '2009-04-02',
+          finishDate: '2011-03-20',
+          description: 'description2',
+          institution: {
+            name: 'name2',
+            location: {
+              country: 'Italia',
+              region: 'region2',
+              address: 'address2',
+            },
+          },
+        },
+        {
+          studyType: 'Grado oficial',
+          degreeAchieved: false,
+          name: 'name',
+          startDate: '2022-11-17',
+          finishDate: '2023-05-01',
+          description: 'description',
+          institution: {
+            name: 'name',
+            location: {
+              country: 'España',
+              region: 'region',
+              address: 'address',
+            },
+          },
+        },
+      ];
+
+      // Act
+      const result: StudiesSectionVm[] = sortStudiesByDate(studies);
+
+      const expectedResult: StudiesSectionVm[] = [
+        {
+          studyType: 'Grado oficial',
+          degreeAchieved: false,
+          name: 'name',
+          startDate: '2022-11-17',
+          finishDate: '2023-05-01',
+          description: 'description',
+          institution: {
+            name: 'name',
+            location: {
+              country: 'España',
+              region: 'region',
+              address: 'address',
+            },
+          },
+        },
+        {
+          studyType: 'Certificación',
+          degreeAchieved: true,
+          name: 'name2',
+          startDate: '2020-12-03',
+          finishDate: '2022-07-08',
+          description: 'description2',
+          institution: {
+            name: 'name2',
+            location: {
+              country: 'Italia',
+              region: 'region2',
+              address: 'address2',
+            },
+          },
+        },
+        {
+          studyType: 'Certificación',
+          degreeAchieved: true,
+          name: 'name2',
+          startDate: '2009-04-02',
+          finishDate: '2011-03-20',
+          description: 'description2',
+          institution: {
+            name: 'name2',
+            location: {
+              country: 'Italia',
+              region: 'region2',
+              address: 'address2',
+            },
+          },
+        },
+      ];
+
+      // Assert
+      expect(result).toEqual(expectedResult);
+    });
+
+    it('should return studies section sorted by starting date. No changes if already sorted', () => {
+      // Arrange
+      const studies: StudiesSectionVm[] = [
+        {
+          studyType: 'Grado oficial',
+          degreeAchieved: false,
+          name: 'name',
+          startDate: '2022-11-17',
+          finishDate: '2023-05-01',
+          description: 'description',
+          institution: {
+            name: 'name',
+            location: {
+              country: 'España',
+              region: 'region',
+              address: 'address',
+            },
+          },
+        },
+        {
+          studyType: 'Certificación',
+          degreeAchieved: true,
+          name: 'name2',
+          startDate: '2020-12-03',
+          finishDate: '2022-07-08',
+          description: 'description2',
+          institution: {
+            name: 'name2',
+            location: {
+              country: 'Italia',
+              region: 'region2',
+              address: 'address2',
+            },
+          },
+        },
+      ];
+
+      // Act
+      const result: StudiesSectionVm[] = sortStudiesByDate(studies);
+
+      const expectedResult: StudiesSectionVm[] = [
+        {
+          studyType: 'Grado oficial',
+          degreeAchieved: false,
+          name: 'name',
+          startDate: '2022-11-17',
+          finishDate: '2023-05-01',
+          description: 'description',
+          institution: {
+            name: 'name',
+            location: {
+              country: 'España',
+              region: 'region',
+              address: 'address',
+            },
+          },
+        },
+        {
+          studyType: 'Certificación',
+          degreeAchieved: true,
+          name: 'name2',
+          startDate: '2020-12-03',
+          finishDate: '2022-07-08',
+          description: 'description2',
+          institution: {
+            name: 'name2',
+            location: {
+              country: 'Italia',
+              region: 'region2',
+              address: 'address2',
+            },
+          },
+        },
+      ];
+
+      // Assert
+      expect(result).toEqual(expectedResult);
+    });
+
+    it('should return same array with one element when array has one element', () => {
+      // Arrange
+      const studies: StudiesSectionVm[] = [
+        {
+          studyType: 'Certificación',
+          degreeAchieved: true,
+          name: 'name2',
+          startDate: '2020-12-03',
+          finishDate: '2022-07-08',
+          description: 'description2',
+          institution: {
+            name: 'name2',
+            location: {
+              country: 'Italia',
+              region: 'region2',
+              address: 'address2',
+            },
+          },
+        },
+      ];
+
+      // Act
+      const result: StudiesSectionVm[] = sortStudiesByDate(studies);
+
+      const expectedResult: StudiesSectionVm[] = [
+        {
+          studyType: 'Certificación',
+          degreeAchieved: true,
+          name: 'name2',
+          startDate: '2020-12-03',
+          finishDate: '2022-07-08',
+          description: 'description2',
+          institution: {
+            name: 'name2',
+            location: {
+              country: 'Italia',
+              region: 'region2',
+              address: 'address2',
+            },
+          },
+        },
+      ];
+
+      // Assert
+      expect(result).toEqual(expectedResult);
+    });
+  });
+});

packages/manfred-common/src/doc-parts/studies-section/studies-section.helpers.ts

@@ -0,0 +1,5 @@
+import { sortByDate } from '../../helpers';
+
+import { StudiesSectionVm } from './studies-section.vm';
+
+export const sortStudiesByDate = (studies: StudiesSectionVm[]): StudiesSectionVm[] => sortByDate(studies, 'startDate');

packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.ts

@@ -1,6 +1,7 @@
 import { ManfredAwesomicCV } from '@/model';
 import { CountryType, Institution, StudiesSectionVm, StudyTypeWithTranslation } from './studies-section.vm';
 import { studiesTypes, countryList } from './studies-section.constants';
+import { sortStudiesByDate } from './studies-section.helpers';
 
 export const mapFromMacCvToStudiesSectionVm = (cv: ManfredAwesomicCV): StudiesSectionVm[] => {
   const studiesMap: StudiesSectionVm[] =
@@ -35,7 +36,9 @@ export const mapFromMacCvToStudiesSectionVm = (cv: ManfredAwesomicCV): StudiesSe
       };
     }) ?? [];
 
-  return studiesMap;
+  const studiesSortedByDate: StudiesSectionVm[] = sortStudiesByDate(studiesMap);
+
+  return studiesSortedByDate;
 };
 
 export const mapStudiesTypes = (studiesType: string, studiesTypes: StudyTypeWithTranslation[]): string => {

packages/manfred-common/src/helpers/date-helpers.ts

@@ -0,0 +1,10 @@
+export const dateExtractor = <T>(item: T, path: keyof T): number => {
+  const date = item[path];
+  if (typeof date === 'string') {
+    return new Date(date).getTime();
+  }
+  throw new Error(`Invalid path: ${path.toString()}`);
+};
+
+export const sortByDate = <T>(array: T[], path: keyof T): T[] =>
+  array.sort((a: T, b: T) => dateExtractor(b, path) - dateExtractor(a, path));

packages/manfred-common/src/helpers/index.ts

@@ -0,0 +1 @@
+export * from './date-helpers';