Skip to content

Commit

Permalink
Merge pull request #5 from salimdellali/develop
Browse files Browse the repository at this point in the history 
updated project description in package.json, updates date and time fo…
  • Loading branch information
@salimdellali
salimdellali authored Nov 11, 2022
2 parents 43f1526 + 681020d commit f1cca45
Show file tree
Hide file tree
Showing 3 changed files with 245 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "yassir-hackathon-backend",
"version": "1.0.0",
"description": "",
"description": "YASSIR Home Services, A platform in which users easily find reliable service providers to meet their needs",
"author": "salim dellali",
"license": "Apache-2.0",
"main": "index.js",
Expand Down
75 changes: 70 additions & 5 deletions src/modules/client/client.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ export default class ClientService {
decription:
'I have a stack of 3 sweaters and 2 pants that needs to be ironed',
address: "2 Rue Larbi Ben M'hidi, Alger Centre, Alger",
postedAt: '2022-10-11T07:00:00.000Z',
postedAt: {
date: '2022/10/11',
time: '07:00',
},
isProfessionalRequested: false,
jobStatus: 'accepted',
},
Expand All @@ -35,7 +38,10 @@ export default class ClientService {
subCategory: 'Car washing',
decription: 'I have a car to wash, inside and outside',
address: "2 Rue Larbi Ben M'hidi, Alger Centre, Alger",
postedAt: '2022-10-10T08:30:00.000Z',
postedAt: {
date: '2022/10/10',
time: '08:30',
},
isProfessionalRequested: true,
jobStatus: 'canceled',
},
Expand All @@ -45,7 +51,10 @@ export default class ClientService {
subCategory: 'Carpet & sofa cleaning',
decription: 'I have a 10 windows to be washed',
address: 'Cité 1 Mai, Blida, Blida',
postedAt: '2022-10-09T18:30:00.000Z',
postedAt: {
date: '2022/10/09',
time: '18:30',
},
isProfessionalRequested: false,
jobStatus: 'completed',
},
Expand All @@ -55,7 +64,10 @@ export default class ClientService {
subCategory: 'Home Cleaning',
decription: 'I have 1 floor that need to be cleaned',
address: 'Cité 1 Mai, Blida, Blida',
postedAt: '2022-10-10T18:30:00.000Z',
postedAt: {
date: '2022/10/11',
time: '18:30',
},
isProfessionalRequested: false,
jobStatus: 'open',
},
Expand All @@ -81,13 +93,19 @@ export default class ClientService {
decription:
'I have a stack of 3 sweaters and 2 pants that needs to be ironed',
address: "2 Rue Larbi Ben M'hidi, Alger Centre, Alger",
postedAt: '2022-10-11T07:00:00.000Z',
postedAt: {
date: '2022/10/11',
time: '07:00',
},
isProfessionalRequested: false,
jobStatus: 'accepted',
},
jobberOffer: [
{
_id: 'jo_1',
proposedPrice: 3000,
message:
'I have an expertise of 10 years in ironing, quality garanteed',
jobber: {
_id: 'j_1',
fullName: 'John Doe',
Expand All @@ -102,6 +120,53 @@ export default class ClientService {
rating: 5,
reviews: 123,
jobsDone: 320,
comments: [
{
_id: 'cm_1',
rating: 5,
postedAt: {
date: '2022/10/06',
time: '19:00',
},
message:
'does clean work, definetly worth recommending',
client: {
c_id: 'c_2',
fullName: 'Herbert Ramirez',
profilePicture:
'https://randomuser.me/api/portraits/men/85.jpg',
phone: '+213681000081',
email: 'herbert@gmail.com',
adresses: [
'Rue de la gare, Boumerdes, Boumerdes',
'Rue de la Méditerranée, Tipaza, Tipaza',
],
requests: [],
},
},
{
_id: 'cm_2',
rating: 4,
postedAt: {
date: '2022/10/05',
time: '10:00',
},
message:
'overall work is done good, some minor improvements needed',
client: {
c_id: 'c_3',
fullName: 'Kylie Mendoza',
profilePicture:
'https://randomuser.me/api/portraits/women/12.jpg',
phone: '+213653303030',
email: 'kylie@gmail.com',
adresses: [
"Rue de l'université, Bab Ezzouar, Alger",
],
requests: ['cr_5'],
},
},
],
},
},
],
Expand Down
176 changes: 174 additions & 2 deletions src/modules/jobber/jobber.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,50 @@ export default class JobberService {
rating: 5,
reviews: 123,
jobsDone: 320,
comments: [
{
_id: 'cm_1',
rating: 5,
postedAt: {
date: '2022/10/06',
time: '19:00',
},
message: 'does clean work, definetly worth recommending',
client: {
c_id: 'c_2',
fullName: 'Herbert Ramirez',
profilePicture:
'https://randomuser.me/api/portraits/men/85.jpg',
phone: '+213681000081',
email: 'herbert@gmail.com',
adresses: [
'Rue de la gare, Boumerdes, Boumerdes',
'Rue de la Méditerranée, Tipaza, Tipaza',
],
requests: [],
},
},
{
_id: 'cm_2',
rating: 4,
postedAt: {
date: '2022/10/05',
time: '10:00',
},
message:
'overall work is done good, some minor improvements needed',
client: {
c_id: 'c_3',
fullName: 'Kylie Mendoza',
profilePicture:
'https://randomuser.me/api/portraits/women/12.jpg',
phone: '+213653303030',
email: 'kylie@gmail.com',
adresses: ["Rue de l'université, Bab Ezzouar, Alger"],
requests: ['cr_5'],
},
},
],
}

return JOBBER
Expand All @@ -26,7 +70,10 @@ export default class JobberService {
subCategory: 'Ironing',
decription: 'I have 5 napkins to be ironed',
address: "Rue de l'université, Bab Ezzouar, Alger",
postedAt: '2022-10-11T15:00:00.000Z',
postedAt: {
date: '2022/10/11',
time: '15:00',
},
isProfessionalRequested: false,
jobStatus: 'open',
},
Expand All @@ -46,13 +93,19 @@ export default class JobberService {
decription:
'I have a stack of 3 sweaters and 2 pants that needs to be ironed',
address: "2 Rue Larbi Ben M'hidi, Alger Centre, Alger",
postedAt: '2022-10-11T07:00:00.000Z',
postedAt: {
date: '2022/10/11',
time: '07:00',
},
isProfessionalRequested: false,
jobStatus: 'accepted',
},
jobberOffer: [
{
_id: 'jo_1',
proposedPrice: 3000,
message:
'I have an expertise of 10 years in ironing, quality garanteed',
jobber: {
_id: 'j_1',
fullName: 'John Doe',
Expand All @@ -67,6 +120,53 @@ export default class JobberService {
rating: 5,
reviews: 123,
jobsDone: 320,
comments: [
{
_id: 'cm_1',
rating: 5,
postedAt: {
date: '2022/10/06',
time: '19:00',
},
message:
'does clean work, definetly worth recommending',
client: {
c_id: 'c_2',
fullName: 'Herbert Ramirez',
profilePicture:
'https://randomuser.me/api/portraits/men/85.jpg',
phone: '+213681000081',
email: 'herbert@gmail.com',
adresses: [
'Rue de la gare, Boumerdes, Boumerdes',
'Rue de la Méditerranée, Tipaza, Tipaza',
],
requests: [],
},
},
{
_id: 'cm_2',
rating: 4,
postedAt: {
date: '2022/10/05',
time: '10:00',
},
message:
'overall work is done good, some minor improvements needed',
client: {
c_id: 'c_3',
fullName: 'Kylie Mendoza',
profilePicture:
'https://randomuser.me/api/portraits/women/12.jpg',
phone: '+213653303030',
email: 'kylie@gmail.com',
adresses: [
"Rue de l'université, Bab Ezzouar, Alger",
],
requests: ['cr_5'],
},
},
],
},
},
],
Expand All @@ -93,6 +193,53 @@ export default class JobberService {
rating: 5,
reviews: 123,
jobsDone: 320,
comments: [
{
_id: 'cm_1',
rating: 5,
postedAt: {
date: '2022/10/06',
time: '19:00',
},
message:
'does clean work, definetly worth recommending',
client: {
c_id: 'c_2',
fullName: 'Herbert Ramirez',
profilePicture:
'https://randomuser.me/api/portraits/men/85.jpg',
phone: '+213681000081',
email: 'herbert@gmail.com',
adresses: [
'Rue de la gare, Boumerdes, Boumerdes',
'Rue de la Méditerranée, Tipaza, Tipaza',
],
requests: [],
},
},
{
_id: 'cm_2',
rating: 4,
postedAt: {
date: '2022/10/05',
time: '10:00',
},
message:
'overall work is done good, some minor improvements needed',
client: {
c_id: 'c_3',
fullName: 'Kylie Mendoza',
profilePicture:
'https://randomuser.me/api/portraits/women/12.jpg',
phone: '+213653303030',
email: 'kylie@gmail.com',
adresses: [
"Rue de l'université, Bab Ezzouar, Alger",
],
requests: ['cr_5'],
},
},
],
},
{
_id: 'j_2',
Expand All @@ -107,6 +254,31 @@ export default class JobberService {
rating: 4,
reviews: 88,
jobsDone: 120,
comments: [
{
_id: 'cm_3',
rating: 4,
postedAt: {
date: '2022/10/05',
time: '11:00',
},
message:
'teacher with working experience and pedagogical approach',
client: {
c_id: 'c_2',
fullName: 'Herbert Ramirez',
profilePicture:
'https://randomuser.me/api/portraits/men/85.jpg',
phone: '+213681000081',
email: 'herbert@gmail.com',
adresses: [
'Rue de la gare, Boumerdes, Boumerdes',
'Rue de la Méditerranée, Tipaza, Tipaza',
],
requests: [],
},
},
],
},
]

Expand Down

0 comments on commit f1cca45

Please sign in to comment.