From b60b2fe37665a5c0aa86062cf56b766e0d6afdf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= <marcinczarkowski@onet.eu>
Date: Wed, 21 Aug 2024 19:48:45 +0200
Subject: [PATCH 1/5] feat: provide an example solution for advanced-filtering
 challenge

---
 src/advanced-filtering/src/App.tsx            | 12 ++++++------
 .../src/components/LogFilter.tsx              | 10 +++++-----
 .../src/services/logProcessing.ts             | 19 +++++++++++--------
 src/advanced-filtering/src/types/index.ts     | 13 ++++++-------
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/advanced-filtering/src/App.tsx b/src/advanced-filtering/src/App.tsx
index 74c67d1..4bc168c 100644
--- a/src/advanced-filtering/src/App.tsx
+++ b/src/advanced-filtering/src/App.tsx
@@ -9,14 +9,14 @@ import {
   LogSourceMap,
 } from "./constants";
 import {
+  advancedFilter,
   advancedSort,
   NO_FILTER,
-  simpleLogFilter,
 } from "./services/logProcessing";
 import {
+  FilterCriteria,
   LogEntry,
   LogLevel,
-  SimpleLogFilterCriteria,
   SortCriteria,
   UpdateLogFilterFunction,
 } from "./types";
@@ -29,9 +29,9 @@ function LogDashboard({logs}: LogDashboardProps) {
   const [sortCriteria, setSortCriteria] = useState<SortCriteria<LogEntry>>({
     timestamp: {direction: "desc"},
   });
-  const [filterCriteria, setFilterCriteria] = useState<SimpleLogFilterCriteria>(
-    {}
-  );
+  const [filterCriteria, setFilterCriteria] = useState<
+    FilterCriteria<LogEntry>
+  >({});
 
   const compareLogLevels = (a: LogLevel, b: LogLevel) =>
     LogLevelOrder[a] - LogLevelOrder[b];
@@ -58,7 +58,7 @@ function LogDashboard({logs}: LogDashboardProps) {
   };
 
   const filteredAndSortedLogs = useMemo(() => {
-    const filteredLogs = simpleLogFilter(logs, filterCriteria);
+    const filteredLogs = advancedFilter(logs, filterCriteria);
     return advancedSort(filteredLogs, sortCriteria);
   }, [logs, filterCriteria, sortCriteria]);
 
diff --git a/src/advanced-filtering/src/components/LogFilter.tsx b/src/advanced-filtering/src/components/LogFilter.tsx
index 09454a1..09e4ae4 100644
--- a/src/advanced-filtering/src/components/LogFilter.tsx
+++ b/src/advanced-filtering/src/components/LogFilter.tsx
@@ -1,6 +1,6 @@
 import {
-  SimpleFilterableLogValue,
-  SimpleLogFilterKey,
+  FilterableLogValue,
+  LogFilterKey,
   UpdateLogFilterFunction,
 } from "../types";
 
@@ -18,8 +18,8 @@ const SelectArrow = () => (
 
 interface LogFilterProps {
   updateFilter: UpdateLogFilterFunction;
-  filterKey: SimpleLogFilterKey;
-  options: readonly SimpleFilterableLogValue[];
+  filterKey: LogFilterKey;
+  options: readonly FilterableLogValue[];
   allLabel: string;
 }
 
@@ -32,7 +32,7 @@ export const LogFilter = ({
   <div className='relative inline-block w-full'>
     <select
       onChange={(e) =>
-        updateFilter(filterKey, e.target.value as SimpleFilterableLogValue | "")
+        updateFilter(filterKey, e.target.value as FilterableLogValue | "")
       }
       className='w-full px-4 py-2 pr-10 text-gray-700 bg-white border rounded-lg appearance-none focus:outline-none focus:ring-2 focus:ring-blue-500'
     >
diff --git a/src/advanced-filtering/src/services/logProcessing.ts b/src/advanced-filtering/src/services/logProcessing.ts
index 533cee9..3ab7063 100644
--- a/src/advanced-filtering/src/services/logProcessing.ts
+++ b/src/advanced-filtering/src/services/logProcessing.ts
@@ -1,4 +1,4 @@
-import {LogEntry, SimpleLogFilterCriteria, SortCriteria} from "../types";
+import {FilterCriteria, SortCriteria} from "../types";
 
 export function advancedSort<ItemType>(
   arr: ItemType[],
@@ -23,20 +23,23 @@ export function advancedSort<ItemType>(
 
 export const NO_FILTER = null;
 
-export function simpleLogFilter(
-  logs: any[],
-  criteria: SimpleLogFilterCriteria
-): any[] {
-  return logs.filter((log) => {
+export function advancedFilter<ItemType>(
+  arr: ItemType[],
+  criteria: FilterCriteria<ItemType>
+): ItemType[] {
+  return arr.filter((log) => {
     return (
-      Object.entries(criteria) as [keyof LogEntry, SimpleLogFilterCriteria][]
+      Object.entries(criteria) as [
+        keyof ItemType,
+        FilterCriteria<ItemType>[keyof ItemType]
+      ][]
     ).every(([key, condition]) => {
       if (condition === NO_FILTER) {
         return true;
       }
       const value = log[key];
       if (typeof condition === "function") {
-        return (condition as (value: any) => boolean)(value);
+        return condition(value);
       }
       return value === condition;
     });
diff --git a/src/advanced-filtering/src/types/index.ts b/src/advanced-filtering/src/types/index.ts
index 2e92d7a..95a6714 100644
--- a/src/advanced-filtering/src/types/index.ts
+++ b/src/advanced-filtering/src/types/index.ts
@@ -26,16 +26,15 @@ export type SortCriteria<ItemType> = {
   };
 };
 
-export type SimpleLogFilterCriteria = {
-  level?: LogLevel | ((value: LogLevel) => boolean);
-  source?: LogSource | ((value: LogSource) => boolean);
+export type FilterCriteria<ItemType> = {
+  [Key in keyof ItemType]?: ItemType[Key] | ((value: ItemType[Key]) => boolean);
 };
 
-export type SimpleLogFilterKey = "level" | "source";
+export type LogFilterKey = Extract<keyof LogEntry, "level" | "source">;
 
-export type SimpleFilterableLogValue = LogLevel | LogSource;
+export type FilterableLogValue = LogEntry[LogFilterKey];
 
 export type UpdateLogFilterFunction = (
-  key: SimpleLogFilterKey,
-  value: SimpleFilterableLogValue | ""
+  key: LogFilterKey,
+  value: FilterableLogValue | ""
 ) => void;

From b2995738d6df605ebb2f6819b53484312065a1b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= <marcinczarkowski@onet.eu>
Date: Wed, 21 Aug 2024 19:51:24 +0200
Subject: [PATCH 2/5] chore: mention pull request with the solution

---
 src/advanced-filtering/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/advanced-filtering/README.md b/src/advanced-filtering/README.md
index 4420dc3..8b3bc74 100644
--- a/src/advanced-filtering/README.md
+++ b/src/advanced-filtering/README.md
@@ -37,6 +37,6 @@ npm run build
 
 ## 🌟 Example solution
 
-As this is an advanced challenge, there is no single correct solution. However, you can find an example solution in the `advanced-filtering-solution` branch.
+As this is an advanced challenge, there is no single correct solution. However, you can find an example solution in the `advanced-filtering-solution` branch and [Pull Request: Example solution for Advanced Filtering Challenge #30](https://github.com/przeprogramowani/typescript-challenges/pull/30).
 
 Before checking the solution, try to solve the challenge on your own! Use sorting-related code as a reference and try to apply similar typing techniques to filtering-related code.

From 0fd94ba7ce3bb8d07131f4cf7ec05cbff560bc27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= <marcinczarkowski@onet.eu>
Date: Thu, 22 Aug 2024 08:54:32 +0200
Subject: [PATCH 3/5] fix: introduce type constraint for ItemType

---
 .../src/services/logProcessing.ts             | 12 +++++-----
 src/advanced-filtering/src/types/index.ts     | 22 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/advanced-filtering/src/services/logProcessing.ts b/src/advanced-filtering/src/services/logProcessing.ts
index 3ab7063..7399651 100644
--- a/src/advanced-filtering/src/services/logProcessing.ts
+++ b/src/advanced-filtering/src/services/logProcessing.ts
@@ -1,12 +1,12 @@
-import {FilterCriteria, SortCriteria} from "../types";
+import { FilterCriteria, SortCriteria } from '../types';
 
-export function advancedSort<ItemType>(
+export function advancedSort<ItemType extends object>(
   arr: ItemType[],
   criteria: SortCriteria<ItemType>
 ): ItemType[] {
   return [...arr].sort((a, b) => {
     for (const key in criteria) {
-      const {direction, customCompare} = criteria[key] || {};
+      const { direction, customCompare } = criteria[key] || {};
       if (a[key] !== b[key]) {
         let comparison: number;
         if (customCompare) {
@@ -14,7 +14,7 @@ export function advancedSort<ItemType>(
         } else {
           comparison = a[key] < b[key] ? -1 : 1;
         }
-        return direction === "desc" ? -comparison : comparison;
+        return direction === 'desc' ? -comparison : comparison;
       }
     }
     return 0;
@@ -23,7 +23,7 @@ export function advancedSort<ItemType>(
 
 export const NO_FILTER = null;
 
-export function advancedFilter<ItemType>(
+export function advancedFilter<ItemType extends object>(
   arr: ItemType[],
   criteria: FilterCriteria<ItemType>
 ): ItemType[] {
@@ -38,7 +38,7 @@ export function advancedFilter<ItemType>(
         return true;
       }
       const value = log[key];
-      if (typeof condition === "function") {
+      if (typeof condition === 'function') {
         return condition(value);
       }
       return value === condition;
diff --git a/src/advanced-filtering/src/types/index.ts b/src/advanced-filtering/src/types/index.ts
index 95a6714..d834442 100644
--- a/src/advanced-filtering/src/types/index.ts
+++ b/src/advanced-filtering/src/types/index.ts
@@ -1,10 +1,10 @@
-export type LogLevel = "INFO" | "WARNING" | "ERROR";
+export type LogLevel = 'INFO' | 'WARNING' | 'ERROR';
 export type LogSource =
-  | "user-service"
-  | "auth-service"
-  | "payment-service"
-  | "notification-service"
-  | "api-gateway";
+  | 'user-service'
+  | 'auth-service'
+  | 'payment-service'
+  | 'notification-service'
+  | 'api-gateway';
 
 export interface LogEntry {
   timestamp: Date;
@@ -19,22 +19,22 @@ export type CompareFunction<ItemTypeValue> = (
   b: ItemTypeValue
 ) => number;
 
-export type SortCriteria<ItemType> = {
+export type SortCriteria<ItemType extends object> = {
   [Key in keyof ItemType]?: {
-    direction: "asc" | "desc";
+    direction: 'asc' | 'desc';
     customCompare?: CompareFunction<ItemType[Key]>;
   };
 };
 
-export type FilterCriteria<ItemType> = {
+export type FilterCriteria<ItemType extends object> = {
   [Key in keyof ItemType]?: ItemType[Key] | ((value: ItemType[Key]) => boolean);
 };
 
-export type LogFilterKey = Extract<keyof LogEntry, "level" | "source">;
+export type LogFilterKey = Extract<keyof LogEntry, 'level' | 'source'>;
 
 export type FilterableLogValue = LogEntry[LogFilterKey];
 
 export type UpdateLogFilterFunction = (
   key: LogFilterKey,
-  value: FilterableLogValue | ""
+  value: FilterableLogValue | ''
 ) => void;

From c13fe513fac7602b2bce9b7280aec9eb7940d03c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= <marcinczarkowski@onet.eu>
Date: Thu, 22 Aug 2024 11:28:23 +0200
Subject: [PATCH 4/5] chore: apply prettier styling

---
 src/advanced-filtering/src/App.tsx            | 60 +++++++-------
 .../src/components/LogFilter.tsx              | 20 ++---
 .../src/components/LogLevelBadge.tsx          | 22 ++---
 .../src/components/LogSortingHeader.tsx       |  6 +-
 src/advanced-filtering/src/constants/index.ts | 32 ++++----
 src/advanced-filtering/src/data/logs.ts       | 82 +++++++++----------
 src/advanced-filtering/src/main.tsx           | 14 ++--
 .../src/services/logProcessing.ts             |  6 +-
 src/advanced-filtering/src/types/index.ts     |  4 +-
 src/advanced-filtering/vite.config.ts         |  6 +-
 10 files changed, 126 insertions(+), 126 deletions(-)

diff --git a/src/advanced-filtering/src/App.tsx b/src/advanced-filtering/src/App.tsx
index 4bc168c..28c18a4 100644
--- a/src/advanced-filtering/src/App.tsx
+++ b/src/advanced-filtering/src/App.tsx
@@ -1,33 +1,33 @@
-import {useMemo, useState} from "react";
-import {LogFilter} from "./components/LogFilter";
-import {LogLevelBadge} from "./components/LogLevelBadge";
-import {LogSortingHeader} from "./components/LogSortingHeader";
+import { useMemo, useState } from 'react';
+import { LogFilter } from './components/LogFilter';
+import { LogLevelBadge } from './components/LogLevelBadge';
+import { LogSortingHeader } from './components/LogSortingHeader';
 import {
   LogEntryFields,
   LogLevelMap,
   LogLevelOrder,
   LogSourceMap,
-} from "./constants";
+} from './constants';
 import {
   advancedFilter,
   advancedSort,
   NO_FILTER,
-} from "./services/logProcessing";
+} from './services/logProcessing';
 import {
   FilterCriteria,
   LogEntry,
   LogLevel,
   SortCriteria,
   UpdateLogFilterFunction,
-} from "./types";
+} from './types';
 
 interface LogDashboardProps {
   logs: LogEntry[];
 }
 
-function LogDashboard({logs}: LogDashboardProps) {
+function LogDashboard({ logs }: LogDashboardProps) {
   const [sortCriteria, setSortCriteria] = useState<SortCriteria<LogEntry>>({
-    timestamp: {direction: "desc"},
+    timestamp: { direction: 'desc' },
   });
   const [filterCriteria, setFilterCriteria] = useState<
     FilterCriteria<LogEntry>
@@ -38,13 +38,13 @@ function LogDashboard({logs}: LogDashboardProps) {
 
   const toggleSort = (key: keyof LogEntry) => {
     setSortCriteria((prev) => {
-      const direction = prev[key]?.direction === "asc" ? "desc" : "asc";
-      const baseCriteria = {direction};
+      const direction = prev[key]?.direction === 'asc' ? 'desc' : 'asc';
+      const baseCriteria = { direction };
 
       return {
         [key]:
-          key === "level"
-            ? {...baseCriteria, customCompare: compareLogLevels}
+          key === 'level'
+            ? { ...baseCriteria, customCompare: compareLogLevels }
             : baseCriteria,
       };
     });
@@ -53,7 +53,7 @@ function LogDashboard({logs}: LogDashboardProps) {
   const updateFilter: UpdateLogFilterFunction = (key, value) => {
     setFilterCriteria((prev) => ({
       ...prev,
-      [key]: value === "" ? NO_FILTER : value,
+      [key]: value === '' ? NO_FILTER : value,
     }));
   };
 
@@ -63,26 +63,26 @@ function LogDashboard({logs}: LogDashboardProps) {
   }, [logs, filterCriteria, sortCriteria]);
 
   return (
-    <div className='container p-6 mx-auto'>
-      <div className='flex mb-4 space-x-4'>
+    <div className="container p-6 mx-auto">
+      <div className="flex mb-4 space-x-4">
         <LogFilter
           updateFilter={updateFilter}
-          filterKey='level'
+          filterKey="level"
           options={Object.values(LogLevelMap)}
-          allLabel='All levels'
+          allLabel="All levels"
         />
         <LogFilter
           updateFilter={updateFilter}
-          filterKey='source'
+          filterKey="source"
           options={Object.values(LogSourceMap)}
-          allLabel='All sources'
+          allLabel="All sources"
         />
       </div>
-      <div className='overflow-x-auto shadow-md sm:rounded-lg'>
-        <table className='w-full mx-auto text-sm text-left text-gray-500'>
-          <thead className='text-xs text-gray-700 uppercase bg-gray-50'>
+      <div className="overflow-x-auto shadow-md sm:rounded-lg">
+        <table className="w-full mx-auto text-sm text-left text-gray-500">
+          <thead className="text-xs text-gray-700 uppercase bg-gray-50">
             <tr>
-              {LogEntryFields.map(({key, label, className}) => (
+              {LogEntryFields.map(({ key, label, className }) => (
                 <LogSortingHeader
                   key={key}
                   field={key}
@@ -96,16 +96,16 @@ function LogDashboard({logs}: LogDashboardProps) {
           </thead>
           <tbody>
             {filteredAndSortedLogs.map((log, index) => (
-              <tr key={index} className='bg-white border-b hover:bg-gray-50'>
-                <td className='px-6 py-4'>
+              <tr key={index} className="bg-white border-b hover:bg-gray-50">
+                <td className="px-6 py-4">
                   {log.timestamp.toISOString().slice(0, 19)}
                 </td>
-                <td className='px-6 py-4'>
+                <td className="px-6 py-4">
                   <LogLevelBadge level={log.level} />
                 </td>
-                <td className='px-6 py-4'>{log.source}</td>
-                <td className='px-6 py-4'>{log.message}</td>
-                <td className='px-6 py-4'>{log.userId}</td>
+                <td className="px-6 py-4">{log.source}</td>
+                <td className="px-6 py-4">{log.message}</td>
+                <td className="px-6 py-4">{log.userId}</td>
               </tr>
             ))}
           </tbody>
diff --git a/src/advanced-filtering/src/components/LogFilter.tsx b/src/advanced-filtering/src/components/LogFilter.tsx
index 09e4ae4..4b48fb9 100644
--- a/src/advanced-filtering/src/components/LogFilter.tsx
+++ b/src/advanced-filtering/src/components/LogFilter.tsx
@@ -2,16 +2,16 @@ import {
   FilterableLogValue,
   LogFilterKey,
   UpdateLogFilterFunction,
-} from "../types";
+} from '../types';
 
 const SelectArrow = () => (
-  <div className='absolute inset-y-0 right-0 flex items-center px-2 text-gray-700 pointer-events-none'>
+  <div className="absolute inset-y-0 right-0 flex items-center px-2 text-gray-700 pointer-events-none">
     <svg
-      className='w-4 h-4 fill-current'
-      xmlns='http://www.w3.org/2000/svg'
-      viewBox='0 0 20 20'
+      className="w-4 h-4 fill-current"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 20 20"
     >
-      <path d='M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z' />
+      <path d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" />
     </svg>
   </div>
 );
@@ -29,14 +29,14 @@ export const LogFilter = ({
   options,
   allLabel,
 }: LogFilterProps) => (
-  <div className='relative inline-block w-full'>
+  <div className="relative inline-block w-full">
     <select
       onChange={(e) =>
-        updateFilter(filterKey, e.target.value as FilterableLogValue | "")
+        updateFilter(filterKey, e.target.value as FilterableLogValue | '')
       }
-      className='w-full px-4 py-2 pr-10 text-gray-700 bg-white border rounded-lg appearance-none focus:outline-none focus:ring-2 focus:ring-blue-500'
+      className="w-full px-4 py-2 pr-10 text-gray-700 bg-white border rounded-lg appearance-none focus:outline-none focus:ring-2 focus:ring-blue-500"
     >
-      <option value=''>{allLabel}</option>
+      <option value="">{allLabel}</option>
       {options.map((option) => (
         <option key={option} value={option}>
           {option}
diff --git a/src/advanced-filtering/src/components/LogLevelBadge.tsx b/src/advanced-filtering/src/components/LogLevelBadge.tsx
index d00e806..6b2413a 100644
--- a/src/advanced-filtering/src/components/LogLevelBadge.tsx
+++ b/src/advanced-filtering/src/components/LogLevelBadge.tsx
@@ -1,28 +1,28 @@
-import React from "react";
-import {LogLevel} from "../types";
+import React from 'react';
+import { LogLevel } from '../types';
 
 interface LogLevelBadgeProps {
   level: LogLevel;
 }
 
-export const LogLevelBadge: React.FC<LogLevelBadgeProps> = ({level}) => {
+export const LogLevelBadge: React.FC<LogLevelBadgeProps> = ({ level }) => {
   const getBadgeColor = (level: LogLevel) => {
     switch (level) {
-      case "INFO":
-        return "bg-blue-100 text-blue-800";
-      case "WARNING":
-        return "bg-yellow-100 text-yellow-800";
-      case "ERROR":
-        return "bg-red-100 text-red-800";
+      case 'INFO':
+        return 'bg-blue-100 text-blue-800';
+      case 'WARNING':
+        return 'bg-yellow-100 text-yellow-800';
+      case 'ERROR':
+        return 'bg-red-100 text-red-800';
       default:
-        return "bg-gray-100 text-gray-800";
+        return 'bg-gray-100 text-gray-800';
     }
   };
 
   return (
     <span
       className={`px-2 py-1 rounded-full text-xs font-medium ${getBadgeColor(
-        level
+        level,
       )}`}
     >
       {level}
diff --git a/src/advanced-filtering/src/components/LogSortingHeader.tsx b/src/advanced-filtering/src/components/LogSortingHeader.tsx
index 51fd658..0d77b05 100644
--- a/src/advanced-filtering/src/components/LogSortingHeader.tsx
+++ b/src/advanced-filtering/src/components/LogSortingHeader.tsx
@@ -1,4 +1,4 @@
-import {LogEntry, SortCriteria} from "../types";
+import { LogEntry, SortCriteria } from '../types';
 
 interface LogSortingHeaderProps {
   field: keyof LogEntry;
@@ -13,10 +13,10 @@ export function LogSortingHeader({
   label,
   sortCriteria,
   toggleSort,
-  className = "",
+  className = '',
 }: LogSortingHeaderProps) {
   const direction = sortCriteria[field]?.direction;
-  const arrow = direction === "asc" ? "↑" : direction === "desc" ? "↓" : "";
+  const arrow = direction === 'asc' ? '↑' : direction === 'desc' ? '↓' : '';
 
   return (
     <th
diff --git a/src/advanced-filtering/src/constants/index.ts b/src/advanced-filtering/src/constants/index.ts
index 32465c2..19567e9 100644
--- a/src/advanced-filtering/src/constants/index.ts
+++ b/src/advanced-filtering/src/constants/index.ts
@@ -1,4 +1,4 @@
-import {LogEntry, LogLevel, LogSource} from "../types";
+import { LogEntry, LogLevel, LogSource } from '../types';
 
 export const LogLevelOrder: Record<LogLevel, number> = {
   ERROR: 3,
@@ -11,23 +11,23 @@ export const LogEntryFields: {
   label: string;
   className?: string;
 }[] = [
-  {key: "timestamp", label: "Timestamp"},
-  {key: "level", label: "Level"},
-  {key: "source", label: "Source", className: "min-w-44"},
-  {key: "message", label: "Message", className: "min-w-80"},
-  {key: "userId", label: "User ID", className: "min-w-24"},
+  { key: 'timestamp', label: 'Timestamp' },
+  { key: 'level', label: 'Level' },
+  { key: 'source', label: 'Source', className: 'min-w-44' },
+  { key: 'message', label: 'Message', className: 'min-w-80' },
+  { key: 'userId', label: 'User ID', className: 'min-w-24' },
 ];
 
-export const LogLevelMap: {[Key in LogLevel]: Key} = {
-  INFO: "INFO",
-  WARNING: "WARNING",
-  ERROR: "ERROR",
+export const LogLevelMap: { [Key in LogLevel]: Key } = {
+  INFO: 'INFO',
+  WARNING: 'WARNING',
+  ERROR: 'ERROR',
 };
 
-export const LogSourceMap: {[Key in LogSource]: Key} = {
-  "user-service": "user-service",
-  "auth-service": "auth-service",
-  "payment-service": "payment-service",
-  "notification-service": "notification-service",
-  "api-gateway": "api-gateway",
+export const LogSourceMap: { [Key in LogSource]: Key } = {
+  'user-service': 'user-service',
+  'auth-service': 'auth-service',
+  'payment-service': 'payment-service',
+  'notification-service': 'notification-service',
+  'api-gateway': 'api-gateway',
 };
diff --git a/src/advanced-filtering/src/data/logs.ts b/src/advanced-filtering/src/data/logs.ts
index 149029e..2b6adf3 100644
--- a/src/advanced-filtering/src/data/logs.ts
+++ b/src/advanced-filtering/src/data/logs.ts
@@ -1,71 +1,71 @@
-import {LogEntry} from "../types";
+import { LogEntry } from '../types';
 
 const fakeLogEntries: LogEntry[] = [
   {
-    timestamp: new Date("2024-08-20T08:30:15Z"),
-    level: "INFO",
-    message: "User successfully logged in",
-    source: "auth-service",
+    timestamp: new Date('2024-08-20T08:30:15Z'),
+    level: 'INFO',
+    message: 'User successfully logged in',
+    source: 'auth-service',
     userId: 1001,
   },
   {
-    timestamp: new Date("2024-08-20T08:31:22Z"),
-    level: "ERROR",
-    message: "Failed to process payment: Invalid card number",
-    source: "payment-service",
+    timestamp: new Date('2024-08-20T08:31:22Z'),
+    level: 'ERROR',
+    message: 'Failed to process payment: Invalid card number',
+    source: 'payment-service',
     userId: 1002,
   },
   {
-    timestamp: new Date("2024-08-20T08:32:45Z"),
-    level: "WARNING",
-    message: "High CPU usage detected",
-    source: "api-gateway",
+    timestamp: new Date('2024-08-20T08:32:45Z'),
+    level: 'WARNING',
+    message: 'High CPU usage detected',
+    source: 'api-gateway',
   },
   {
-    timestamp: new Date("2024-08-20T08:33:10Z"),
-    level: "INFO",
-    message: "New user registered",
-    source: "user-service",
+    timestamp: new Date('2024-08-20T08:33:10Z'),
+    level: 'INFO',
+    message: 'New user registered',
+    source: 'user-service',
     userId: 1003,
   },
   {
-    timestamp: new Date("2024-08-20T08:34:30Z"),
-    level: "ERROR",
-    message: "Database connection lost",
-    source: "user-service",
+    timestamp: new Date('2024-08-20T08:34:30Z'),
+    level: 'ERROR',
+    message: 'Database connection lost',
+    source: 'user-service',
   },
   {
-    timestamp: new Date("2024-08-20T08:35:12Z"),
-    level: "INFO",
-    message: "Password reset email sent",
-    source: "notification-service",
+    timestamp: new Date('2024-08-20T08:35:12Z'),
+    level: 'INFO',
+    message: 'Password reset email sent',
+    source: 'notification-service',
     userId: 1004,
   },
   {
-    timestamp: new Date("2024-08-20T08:36:05Z"),
-    level: "WARNING",
-    message: "Rate limit exceeded for API key",
-    source: "api-gateway",
+    timestamp: new Date('2024-08-20T08:36:05Z'),
+    level: 'WARNING',
+    message: 'Rate limit exceeded for API key',
+    source: 'api-gateway',
   },
   {
-    timestamp: new Date("2024-08-20T08:37:20Z"),
-    level: "INFO",
-    message: "Successful payment processed",
-    source: "payment-service",
+    timestamp: new Date('2024-08-20T08:37:20Z'),
+    level: 'INFO',
+    message: 'Successful payment processed',
+    source: 'payment-service',
     userId: 1005,
   },
   {
-    timestamp: new Date("2024-08-20T08:38:40Z"),
-    level: "ERROR",
-    message: "Failed to send notification: User not found",
-    source: "notification-service",
+    timestamp: new Date('2024-08-20T08:38:40Z'),
+    level: 'ERROR',
+    message: 'Failed to send notification: User not found',
+    source: 'notification-service',
     userId: 1006,
   },
   {
-    timestamp: new Date("2024-08-20T08:39:55Z"),
-    level: "INFO",
-    message: "User profile updated",
-    source: "user-service",
+    timestamp: new Date('2024-08-20T08:39:55Z'),
+    level: 'INFO',
+    message: 'User profile updated',
+    source: 'user-service',
     userId: 1007,
   },
 ];
diff --git a/src/advanced-filtering/src/main.tsx b/src/advanced-filtering/src/main.tsx
index 29659d1..1c2c89b 100644
--- a/src/advanced-filtering/src/main.tsx
+++ b/src/advanced-filtering/src/main.tsx
@@ -1,11 +1,11 @@
-import {StrictMode} from "react";
-import {createRoot} from "react-dom/client";
-import App from "./App.tsx";
-import fakeLogEntries from "./data/logs.ts";
-import "./index.css";
+import { StrictMode } from 'react';
+import { createRoot } from 'react-dom/client';
+import App from './App.tsx';
+import fakeLogEntries from './data/logs.ts';
+import './index.css';
 
-createRoot(document.getElementById("root")!).render(
+createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <App logs={fakeLogEntries} />
-  </StrictMode>
+  </StrictMode>,
 );
diff --git a/src/advanced-filtering/src/services/logProcessing.ts b/src/advanced-filtering/src/services/logProcessing.ts
index 7399651..cb344dc 100644
--- a/src/advanced-filtering/src/services/logProcessing.ts
+++ b/src/advanced-filtering/src/services/logProcessing.ts
@@ -2,7 +2,7 @@ import { FilterCriteria, SortCriteria } from '../types';
 
 export function advancedSort<ItemType extends object>(
   arr: ItemType[],
-  criteria: SortCriteria<ItemType>
+  criteria: SortCriteria<ItemType>,
 ): ItemType[] {
   return [...arr].sort((a, b) => {
     for (const key in criteria) {
@@ -25,13 +25,13 @@ export const NO_FILTER = null;
 
 export function advancedFilter<ItemType extends object>(
   arr: ItemType[],
-  criteria: FilterCriteria<ItemType>
+  criteria: FilterCriteria<ItemType>,
 ): ItemType[] {
   return arr.filter((log) => {
     return (
       Object.entries(criteria) as [
         keyof ItemType,
-        FilterCriteria<ItemType>[keyof ItemType]
+        FilterCriteria<ItemType>[keyof ItemType],
       ][]
     ).every(([key, condition]) => {
       if (condition === NO_FILTER) {
diff --git a/src/advanced-filtering/src/types/index.ts b/src/advanced-filtering/src/types/index.ts
index d834442..416c492 100644
--- a/src/advanced-filtering/src/types/index.ts
+++ b/src/advanced-filtering/src/types/index.ts
@@ -16,7 +16,7 @@ export interface LogEntry {
 
 export type CompareFunction<ItemTypeValue> = (
   a: ItemTypeValue,
-  b: ItemTypeValue
+  b: ItemTypeValue,
 ) => number;
 
 export type SortCriteria<ItemType extends object> = {
@@ -36,5 +36,5 @@ export type FilterableLogValue = LogEntry[LogFilterKey];
 
 export type UpdateLogFilterFunction = (
   key: LogFilterKey,
-  value: FilterableLogValue | ''
+  value: FilterableLogValue | '',
 ) => void;
diff --git a/src/advanced-filtering/vite.config.ts b/src/advanced-filtering/vite.config.ts
index 5a33944..627a319 100644
--- a/src/advanced-filtering/vite.config.ts
+++ b/src/advanced-filtering/vite.config.ts
@@ -1,7 +1,7 @@
-import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react'
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
-})
+});

From 9a85eb88f88a3e912a76efdd37e8391c0a225d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= <marcinczarkowski@onet.eu>
Date: Thu, 22 Aug 2024 11:33:43 +0200
Subject: [PATCH 5/5] chore: point to PR as solution

---
 src/advanced-filtering/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/advanced-filtering/README.md b/src/advanced-filtering/README.md
index 8b3bc74..bb41b13 100644
--- a/src/advanced-filtering/README.md
+++ b/src/advanced-filtering/README.md
@@ -37,6 +37,6 @@ npm run build
 
 ## 🌟 Example solution
 
-As this is an advanced challenge, there is no single correct solution. However, you can find an example solution in the `advanced-filtering-solution` branch and [Pull Request: Example solution for Advanced Filtering Challenge #30](https://github.com/przeprogramowani/typescript-challenges/pull/30).
+As this is an advanced challenge, there is no single correct solution. However, you can find an example solution in the [Pull Request: Example solution for Advanced Filtering Challenge #30](https://github.com/przeprogramowani/typescript-challenges/pull/30).
 
 Before checking the solution, try to solve the challenge on your own! Use sorting-related code as a reference and try to apply similar typing techniques to filtering-related code.