Skip to content

Commit

Permalink
Update supplierController.ts and supplier.test.ts
Browse files Browse the repository at this point in the history
  • Loading branch information
@aelassas
aelassas committed Nov 17, 2024
1 parent 3e1f951 commit 392762f
Show file tree
Hide file tree
Showing 2 changed files with 131 additions and 5 deletions.
11 changes: 10 additions & 1 deletion api/src/controllers/supplierController.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export const deleteSupplier = async (req: Request, res: Response) => {
}
}

if (supplier.contracts) {
if (supplier.contracts && supplier.contracts.length > 0) {
for (const contract of supplier.contracts) {
if (contract.file) {
const file = path.join(env.CDN_CONTRACTS, contract.file)
Expand Down Expand Up @@ -559,6 +559,9 @@ export const createContract = async (req: Request, res: Response) => {
if (!req.file) {
throw new Error('req.file not found')
}
if (!req.file.originalname.includes('.')) {
throw new Error('File extension not found')
}
if (language.length !== 2) {
throw new Error('Language not valid')
}
Expand Down Expand Up @@ -591,6 +594,9 @@ export const updateContract = async (req: Request, res: Response) => {
if (!file) {
throw new Error('req.file not found')
}
if (!file.originalname.includes('.')) {
throw new Error('File extension not found')
}
if (!helper.isValidObjectId(id)) {
throw new Error('Supplier Id not valid')
}
Expand Down Expand Up @@ -683,6 +689,9 @@ export const deleteTempContract = async (req: Request, res: Response) => {
const { file } = req.params

try {
if (!file.includes('.')) {
throw new Error('Filename not valid')
}
const contractFile = path.join(env.CDN_TEMP_CONTRACTS, file)
if (await helper.exists(contractFile)) {
await fs.unlink(contractFile)
Expand Down
125 changes: 121 additions & 4 deletions api/tests/supplier.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,54 @@ describe('DELETE /api/delete-supplier/:id', () => {
it('should delete a supplier', async () => {
const token = await testHelper.signinAsAdmin()

// test success (no avatar no contracts)
let supplierName = testHelper.getSupplierName()
let supplierId = await testHelper.createSupplier(`${supplierName}@test.bookcars.ma`, supplierName)
let supplier = await User.findById(supplierId)
expect(supplier).not.toBeNull()
expect(supplier).toBeTruthy()
supplier!.avatar = ''
supplier!.contracts = undefined
await supplier!.save()
let res = await request(app)
.delete(`/api/delete-supplier/${supplierId}`)
.set(env.X_ACCESS_TOKEN, token)
expect(res.statusCode).toBe(200)
supplier = await User.findById(supplierId)
expect(supplier).toBeNull()

// test success (no avatar no contract files)
supplierName = testHelper.getSupplierName()
supplierId = await testHelper.createSupplier(`${supplierName}@test.bookcars.ma`, supplierName)
supplier = await User.findById(supplierId)
expect(supplier).toBeTruthy()
supplier!.contracts = [{ language: 'en', file: null }]
await supplier!.save()
res = await request(app)
.delete(`/api/delete-supplier/${supplierId}`)
.set(env.X_ACCESS_TOKEN, token)
expect(res.statusCode).toBe(200)
supplier = await User.findById(supplierId)
expect(supplier).toBeNull()

// test success (no avatar contract file not found)
supplierName = testHelper.getSupplierName()
supplierId = await testHelper.createSupplier(`${supplierName}@test.bookcars.ma`, supplierName)
supplier = await User.findById(supplierId)
expect(supplier).toBeTruthy()
supplier!.contracts = [{ language: 'en', file: `${nanoid()}.pdf` }]
await supplier!.save()
res = await request(app)
.delete(`/api/delete-supplier/${supplierId}`)
.set(env.X_ACCESS_TOKEN, token)
expect(res.statusCode).toBe(200)
supplier = await User.findById(supplierId)
expect(supplier).toBeNull()

// test success (avatar and contracts)
supplierName = testHelper.getSupplierName()
supplierId = await testHelper.createSupplier(`${supplierName}@test.bookcars.ma`, supplierName)
supplier = await User.findById(supplierId)
expect(supplier).toBeTruthy()
let avatarName = 'avatar1.jpg'
let avatarPath = path.join(__dirname, `./img/${avatarName}`)
let avatar = path.join(env.CDN_USERS, avatarName)
Expand Down Expand Up @@ -351,7 +395,7 @@ describe('DELETE /api/delete-supplier/:id', () => {
_additionalDriver: additionalDriver._id,
})
await booking.save()
let res = await request(app)
res = await request(app)
.delete(`/api/delete-supplier/${supplierId}`)
.set(env.X_ACCESS_TOKEN, token)
expect(res.statusCode).toBe(200)
Expand Down Expand Up @@ -507,6 +551,10 @@ describe('POST /api/frontend-suppliers', () => {
.post('/api/frontend-suppliers')
expect(res.statusCode).toBe(400)

payload.carSpecs!.aircon = undefined
payload.carSpecs!.moreThanFourDoors = undefined
payload.carSpecs!.moreThanFiveSeats = undefined
payload.seats = -1
payload.mileage = [bookcarsTypes.Mileage.Unlimited]
res = await request(app)
.post('/api/frontend-suppliers')
Expand Down Expand Up @@ -581,6 +629,10 @@ describe('POST /api/backend-suppliers', () => {
.set(env.X_ACCESS_TOKEN, token)
expect(res.statusCode).toBe(400)

payload.carSpecs!.aircon = undefined
payload.carSpecs!.moreThanFourDoors = undefined
payload.carSpecs!.moreThanFiveSeats = undefined
payload.seats = -1
payload.mileage = [bookcarsTypes.Mileage.Unlimited]
res = await request(app)
.post('/api/backend-suppliers')
Expand All @@ -597,6 +649,15 @@ describe('POST /api/backend-suppliers', () => {
expect(res.statusCode).toBe(200)
expect(res.body.length).toBeGreaterThan(0)

payload.availability = [bookcarsTypes.Availablity.Available, bookcarsTypes.Availablity.Unavailable]
res = await request(app)
.post('/api/backend-suppliers')
.set(env.X_ACCESS_TOKEN, token)
.send(payload)
expect(res.statusCode).toBe(200)
expect(res.body.length).toBeGreaterThan(0)
payload.availability = undefined

payload.mileage = []
res = await request(app)
.post('/api/backend-suppliers')
Expand Down Expand Up @@ -663,8 +724,8 @@ describe('POST /api/create-contract', () => {
expect(res.statusCode).toBe(200)
const filename = res.body as string
const filePath = path.join(env.CDN_TEMP_CONTRACTS, filename)
const imageExists = await helper.exists(filePath)
expect(imageExists).toBeTruthy()
const contractExists = await helper.exists(filePath)
expect(contractExists).toBeTruthy()
await fs.unlink(filePath)

// test failure (file not sent)
Expand All @@ -673,6 +734,16 @@ describe('POST /api/create-contract', () => {
.set(env.X_ACCESS_TOKEN, token)
expect(res.statusCode).toBe(400)

// test failure (filename not valid)
const invalidContract = path.join(env.CDN_TEMP_CONTRACTS, `${nanoid()}`)
await fs.copyFile(CONTRACT1_PATH, invalidContract)
res = await request(app)
.post('/api/create-contract/en')
.set(env.X_ACCESS_TOKEN, token)
.attach('file', invalidContract)
expect(res.statusCode).toBe(400)
await fs.unlink(invalidContract)

// test failure (language not valid)
res = await request(app)
.post('/api/create-contract/english')
Expand Down Expand Up @@ -736,6 +807,16 @@ describe('POST /api/update-contract/:id', () => {
.set(env.X_ACCESS_TOKEN, token)
expect(res.statusCode).toBe(400)

// test failure (filename not valid)
const invalidContract = path.join(env.CDN_TEMP_CONTRACTS, `${nanoid()}`)
await fs.copyFile(CONTRACT1_PATH, invalidContract)
res = await request(app)
.post(`/api/update-contract/${SUPPLIER1_ID}/en`)
.set(env.X_ACCESS_TOKEN, token)
.attach('file', invalidContract)
expect(res.statusCode).toBe(400)
await fs.unlink(invalidContract)

// test failure (supplier not found)
res = await request(app)
.post(`/api/update-contract/${testHelper.GetRandromObjectIdAsString()}/en`)
Expand Down Expand Up @@ -782,6 +863,36 @@ describe('POST /api/delete-contract/:id', () => {
supplier = await User.findById(SUPPLIER1_ID)
expect(supplier?.contracts?.find((c) => c.language === 'en')?.file).toBeFalsy()

// test success (no contract)
supplier = await User.findById(SUPPLIER1_ID)
expect(supplier).toBeTruthy()
supplier!.contracts = undefined
await supplier!.save()
res = await request(app)
.post(`/api/delete-contract/${SUPPLIER1_ID}/en`)
.set(env.X_ACCESS_TOKEN, token)
expect(res.statusCode).toBe(200)

// test success (contract with no file)
supplier = await User.findById(SUPPLIER1_ID)
expect(supplier).toBeTruthy()
supplier!.contracts = [{ language: 'en', file: null }]
await supplier!.save()
res = await request(app)
.post(`/api/delete-contract/${SUPPLIER1_ID}/en`)
.set(env.X_ACCESS_TOKEN, token)
expect(res.statusCode).toBe(200)

// test success (contract with file not found)
supplier = await User.findById(SUPPLIER1_ID)
expect(supplier).toBeTruthy()
supplier!.contracts = [{ language: 'en', file: `${nanoid()}.pdf` }]
await supplier!.save()
res = await request(app)
.post(`/api/delete-contract/${SUPPLIER1_ID}/en`)
.set(env.X_ACCESS_TOKEN, token)
expect(res.statusCode).toBe(200)

// test failure (supplier not found)
res = await request(app)
.post(`/api/delete-contract/${testHelper.GetRandromObjectIdAsString()}/en`)
Expand Down Expand Up @@ -828,6 +939,12 @@ describe('POST /api/delete-temp-contract/:image', () => {
.set(env.X_ACCESS_TOKEN, token)
expect(res.statusCode).toBe(200)

// test failure (temp file not valid)
res = await request(app)
.post('/api/delete-temp-contract/unknown')
.set(env.X_ACCESS_TOKEN, token)
expect(res.statusCode).toBe(400)

await testHelper.signout(token)
})
})

0 comments on commit 392762f

Please sign in to comment.