[feat] id prop

ibodev1 · Dec 29, 2023 · 1d0a7ce · 1d0a7ce · vercel · Dec 29, 2023
1 parent 4535837
commit 1d0a7ce
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/routes/index.ts b/routes/index.ts
@@ -16,8 +16,8 @@ indexRouter.get('/', async (request: Request, response: Response) => {
 
 		if (
 			request.query.limit
-      && Number(request.query.limit) >= 10
-      && Number(request.query.limit) <= 500
+      		&& Number(request.query.limit) >= 10
+      		&& Number(request.query.limit) <= 500
 		) {
 			responseData = responseData?.slice(0, Number(request.query.limit));
 		} else {

diff --git a/types/kandilli.ts b/types/kandilli.ts
@@ -1,4 +1,5 @@
 export type Earthquake = {
+	id: string;
 	tarih: string;
 	saat: string;
 	enlem: string;

diff --git a/utilities/gen-id.ts b/utilities/gen-id.ts
@@ -0,0 +1,7 @@
+export function genId(sehir: string, bolge: string, date: string): string {
+	return `${getPlaceShortName(sehir, bolge)}-${new Date(date).getTime()}`;
+}
+
+function getPlaceShortName(sehir: string, bolge: string): string {
+	return sehir.slice(0, 2).concat(bolge.slice(0, 2));
+}
diff --git a/utilities/kandilli.ts b/utilities/kandilli.ts
@@ -1,10 +1,11 @@
 import jsdom from 'jsdom';
 import {type Earthquake} from '../types/kandilli.js';
+import {genId} from './gen-id.js';
 
 const {JSDOM} = jsdom;
 
 const bolgeNameParser = (name: string) => {
-	name = name.replaceAll('-', ' ');
+	name = name.replaceAll('-', '/');
 	return name.trim();
 };
 
@@ -33,6 +34,11 @@ const parseLine = (lineArray: string[]): Earthquake => {
 	const [, bolge, sehir]: any = /^(.*?)(?:\((.*)\))?$/.exec(fullYer);
 	const nitelik = lineArray.slice(121);
 	const dataLine: Earthquake = {
+		id: genId(
+			String(sehir).trim().toLowerCase(),
+			String(bolge).trim().toLowerCase(),
+	  		`${combineString(tarih)} ${combineString(saat)}`,
+		),
 		tarih: combineString(tarih),
 		saat: combineString(saat),
 		enlem: combineString(enlem),