updated details info fro adverts

Yariki · Mar 17, 2024 · ef9cabb · ef9cabb
1 parent df25f02
commit ef9cabb
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 21 deletions.
diff --git a/dimria-fe/src/Components/AdvertDetails/index.tsx b/dimria-fe/src/Components/AdvertDetails/index.tsx
@@ -7,7 +7,7 @@ import {
     Dialog, ExpandableText,
     FlexBox,
     FlexBoxAlignItems,
-    Label,
+    Label, Link, MediaGallery, MediaGalleryItem,
     Title,
     TitleLevel,
 } from "@ui5/webcomponents-react";
@@ -35,13 +35,13 @@ const AdvertDetailsModal = forwardRef<typeof Dialog, AdvertDetailsModalProps>((p
         }
 
         dispatch(fetchAdvertDetailsStart(advertId));
-    },[advertId]);
+    },[advertId, dispatch]);
 
     return (
             <Dialog
                 ref={ref}
                 footer={<FlexBox alignItems={FlexBoxAlignItems.Center}><Button onClick={onClose}>Close</Button></FlexBox>}
-                header={<FlexBox alignItems={FlexBoxAlignItems.Center}><Title level={TitleLevel.H4}>{advertDetailsDto?.advert_id}</Title></FlexBox>}
+                header={<FlexBox alignItems={FlexBoxAlignItems.Center}><Link href={advertDetailsDto?.url} target="_blank">{advertDetailsDto?.advert_id}</Link></FlexBox>}
             >
 
                 { isDetailsLoading && <BusyIndicator active delay={0} /> }
@@ -55,10 +55,34 @@ const AdvertDetailsModal = forwardRef<typeof Dialog, AdvertDetailsModalProps>((p
                             <Label>Rooms Count:</Label><Title level={TitleLevel.H6}> {advertDetailsDto?.rooms_count}</Title>
                         </FlexBox>
                         <FlexBox alignItems={FlexBoxAlignItems.Center}>
-                            <ExpandableText  maxCharacters={50}>
+                            <Label>Floor:</Label><Title level={TitleLevel.H6}> {advertDetailsDto?.floor}</Title>
+                        </FlexBox>
+                        <FlexBox alignItems={FlexBoxAlignItems.Center}>
+                            <Label>Building name:</Label><Title level={TitleLevel.H6}> {advertDetailsDto?.building_name}</Title>
+                        </FlexBox>
+                        <FlexBox alignItems={FlexBoxAlignItems.Center}>
+                            <ExpandableText  maxCharacters={50} >
                                 {advertDetailsDto?.description}
                             </ExpandableText>
                         </FlexBox>
+
+                        <FlexBox alignItems={FlexBoxAlignItems.Center}>
+                            <MediaGallery layout="Auto">
+                                {
+                                    advertDetailsDto?.photos.map((photo, index) => {
+                                        return (
+                                            photo.map((item) => (
+                                                    <MediaGalleryItem key={index}>
+                                                        <img src={item} alt="photo" />
+                                                    </MediaGalleryItem>
+                                            ))
+                                        );
+                                    })
+                                }
+                            </MediaGallery>
+                        </FlexBox>
+
+
                     </>
                 )}
             </Dialog>

diff --git a/dimria-fe/src/Components/AdvertsPage/index.tsx b/dimria-fe/src/Components/AdvertsPage/index.tsx
@@ -5,7 +5,7 @@ import {
 } from "@ui5/webcomponents-react";
 import {AdvertList} from "../AdvertList";
 import {AdvertDto} from "../../models/AdvertDto";
-import React, {useEffect, useState, useRef} from "react";
+import {useState, useRef} from "react";
 import {AdvertPrices} from "../AdvertPrices";
 import AdvertDetailsModal from "../AdvertDetails";
 import { createUseStyles } from 'react-jss';

diff --git a/dimria-fe/src/models/AdvertDetailsDto.ts b/dimria-fe/src/models/AdvertDetailsDto.ts
@@ -7,4 +7,10 @@ export interface AdvertDetailsDto{
     currency: string;
     floor: string;
     rooms_count: number;
+    main_photo: string;
+    lat?: number;
+    lon?: number;
+    building_name: string;
+    url: string;
+    photos: string[][];
 }
diff --git a/dimria/handle_details.py b/dimria/handle_details.py
@@ -4,7 +4,7 @@ def build_ptoho_url(file):
     file = split[0] + "xl." + split[1]
     return f'https://cdn.riastatic.com/photos/{file}'
 
-def parse_photos(photos):
+def parse_photos(photos) -> []:
     result = []
     for photoId in photos:
         photo = photos[photoId]

diff --git a/dimria/models/AdvertDetailsResponse.py b/dimria/models/AdvertDetailsResponse.py
@@ -3,7 +3,9 @@
 
 class AdvertDetailsResponse:
 
-    def __init__(self, advert_id, city_name,  description, price, currency,floor, rooms_count, main_photo, lat, lon, building_name, url, photos = []) -> None:
+    photos = []
+
+    def __init__(self, advert_id, city_name,  description, price, currency,floor, rooms_count, main_photo, lat, lon, building_name, url, photos) -> None:
         self.advert_id = advert_id
         self.city_name = city_name
         self.description = description

diff --git a/function_app.py b/function_app.py
@@ -107,7 +107,7 @@ def get_advert_details(req: func.HttpRequest) -> func.HttpResponse:
     if(resultRequest is None):
         return func.HttpResponse("No advert details found", status_code=404)
 
-    print(type(resultRequest))
+    print(resultRequest)
 
     cityName = resultRequest['city_name']
     state_id = resultRequest['state_id']
@@ -126,19 +126,19 @@ def get_advert_details(req: func.HttpRequest) -> func.HttpResponse:
     url = build_main_advert_url(resultRequest['beautiful_url'])
 
     resultResponse: AdvertDetailsResponse = AdvertDetailsResponse(
-        advert_id=advert_id,
-        city_name=cityName,
-        price=price,
-        rooms_count=rooms_count,
-        currency=currency_type_uk,
-        description=description,
-        floor=floor,
-        main_photo=main_photo,
-        lat = lat,
-        lon = lon,
-        building_name = building_name,
-        url = url,
-        photos=photos
+        advert_id,
+        cityName,
+        price,
+        rooms_count,
+        currency_type_uk,
+        description,
+        floor,
+        main_photo,
+        lat,
+        lon,
+        building_name,
+        url,
+        photos
     )
 
     data = json.dumps(resultResponse, cls=AdvertDetailsResponseEncoder)