Skip to content

feat: update auth and user management #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prudentbird merged 8 commits into from
Oct 3, 2025
Merged

feat: update auth and user management #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e007f1c
feat: update user status management and introduce user verification p…
prudentbird Oct 3, 2025
2d8fcd9
refactor: rename dgetDashboardData to getDashboardData and remove unu…
prudentbird Oct 3, 2025
47ed4d3
fix: update deactivatedAt handling in user service and entity
prudentbird Oct 3, 2025
d8909f9
feat: add UUID validation to user service and auth guard
prudentbird Oct 3, 2025
96e8e85
fix: enhance update logic and UUID validation in user service
prudentbird Oct 3, 2025
5a2a987
feat: add user indexes for improved query performance
prudentbird Oct 3, 2025
f241fb7
refactor: update user ID handling in AuthGuard tests and enhance User…
prudentbird Oct 3, 2025
ecdc808
refactor: clean up validation helper by removing commented-out code
prudentbird Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
213 changes: 0 additions & 213 deletions backend/src/app.controller.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ import { AbstractResponseDto } from './types/response.dto';
import { CustomHttpException } from './helpers/custom.exception';
import { StateQueryValidator } from './modules/state/dto/state.dto';
import { PhaseQueryValidator } from './modules/phase/dto/phase.dto';
import { StoreQueryValidator } from './modules/store/dto/store.dto';
import { StateModelAction } from './modules/state/state.model-action';
import { PhaseModelAction } from './modules/phase/phase.model-action';
import { StoreModelAction } from './modules/store/store.model-action';
import { StateInterface } from './modules/state/types/state.interface';
import { PhaseInterface } from './modules/phase/types/phase.interface';
import { StoreInterface } from './modules/store/types/store.interface';

const mockStateModelAction = {
get: jest.fn(),
Expand Down Expand Up @@ -254,215 +252,4 @@ describe('AppController', () => {
expect(appService.getPhases).toHaveBeenCalledWith(optionsWithName);
});
});

describe('getDashboardData', () => {
const mockQueryOptions: StoreQueryValidator = {
page: '1',
limit: '10',
name: 'Test Store',
phaseId: 'phase-1',
districtId: 'district-1',
};

const mockStoreResponse: AbstractResponseDto<StoreInterface[]> = {
data: [
{
id: '1',
name: 'Test Store',
address: '123 Test Street',
storeType: 'Retail',
latitude: 9.082,
longitude: 8.6753,
enumeratorId: 'enumerator-1',
phaseId: 'phase-1',
districtId: 'district-1',
stateId: 'state-1',
localGovernmentId: 'lg-1',
landmarks: 'Near Test Landmark',
photos: ['photo1.jpg', 'photo2.jpg'],
createdAt: new Date(),
updatedAt: new Date(),
},
],
meta: {
total: 1,
page: 1,
limit: 10,
totalPages: 1,
hasNext: false,
hasPrevious: false,
},
message: 'Stores fetched successfully',
};

it('should return paginated dashboard data successfully', async () => {
jest
.spyOn(appService, 'getDashboardData')
.mockResolvedValue(mockStoreResponse);

const result = await appController.getDashboardData(mockQueryOptions);

expect(result).toEqual(mockStoreResponse);
expect(appService.getDashboardData).toHaveBeenCalledWith(
mockQueryOptions,
);
});

it('should handle empty query options', async () => {
const emptyOptions: StoreQueryValidator = {};
jest
.spyOn(appService, 'getDashboardData')
.mockResolvedValue(mockStoreResponse);

const result = await appController.getDashboardData(emptyOptions);

expect(result).toEqual(mockStoreResponse);
expect(appService.getDashboardData).toHaveBeenCalledWith(emptyOptions);
});

it('should handle service errors', async () => {
const error = new CustomHttpException(
'Failed to fetch dashboard data',
HttpStatus.INTERNAL_SERVER_ERROR,
);
jest.spyOn(appService, 'getDashboardData').mockRejectedValue(error);

await expect(
appController.getDashboardData(mockQueryOptions),
).rejects.toThrow(CustomHttpException);
});

it('should validate query parameters with name filter', async () => {
const optionsWithName: StoreQueryValidator = {
page: '1',
limit: '5',
name: 'Supermarket',
};

jest
.spyOn(appService, 'getDashboardData')
.mockResolvedValue(mockStoreResponse);

const result = await appController.getDashboardData(optionsWithName);

expect(result).toEqual(mockStoreResponse);
expect(appService.getDashboardData).toHaveBeenCalledWith(optionsWithName);
});

it('should validate query parameters with phase filter', async () => {
const optionsWithPhase: StoreQueryValidator = {
page: '1',
limit: '10',
phaseId: 'phase-2',
};

jest
.spyOn(appService, 'getDashboardData')
.mockResolvedValue(mockStoreResponse);

const result = await appController.getDashboardData(optionsWithPhase);

expect(result).toEqual(mockStoreResponse);
expect(appService.getDashboardData).toHaveBeenCalledWith(
optionsWithPhase,
);
});

it('should validate query parameters with district filter', async () => {
const optionsWithDistrict: StoreQueryValidator = {
page: '1',
limit: '10',
districtId: 'district-3',
};

jest
.spyOn(appService, 'getDashboardData')
.mockResolvedValue(mockStoreResponse);

const result = await appController.getDashboardData(optionsWithDistrict);

expect(result).toEqual(mockStoreResponse);
expect(appService.getDashboardData).toHaveBeenCalledWith(
optionsWithDistrict,
);
});

it('should validate query parameters with enumerator filter', async () => {
const optionsWithEnumerator: StoreQueryValidator = {
page: '1',
limit: '10',
enumeratorId: 'enumerator-2',
};

jest
.spyOn(appService, 'getDashboardData')
.mockResolvedValue(mockStoreResponse);

const result = await appController.getDashboardData(
optionsWithEnumerator,
);

expect(result).toEqual(mockStoreResponse);
expect(appService.getDashboardData).toHaveBeenCalledWith(
optionsWithEnumerator,
);
});

it('should validate query parameters with local government filter', async () => {
const optionsWithLocalGov: StoreQueryValidator = {
page: '1',
limit: '10',
localGovernmentId: 'lg-2',
};

jest
.spyOn(appService, 'getDashboardData')
.mockResolvedValue(mockStoreResponse);

const result = await appController.getDashboardData(optionsWithLocalGov);

expect(result).toEqual(mockStoreResponse);
expect(appService.getDashboardData).toHaveBeenCalledWith(
optionsWithLocalGov,
);
});

it('should handle multiple filter parameters', async () => {
const multipleFilters: StoreQueryValidator = {
page: '2',
limit: '15',
name: 'Mall',
phaseId: 'phase-1',
districtId: 'district-2',
enumeratorId: 'enumerator-3',
};

jest
.spyOn(appService, 'getDashboardData')
.mockResolvedValue(mockStoreResponse);

const result = await appController.getDashboardData(multipleFilters);

expect(result).toEqual(mockStoreResponse);
expect(appService.getDashboardData).toHaveBeenCalledWith(multipleFilters);
});

it('should handle pagination parameters correctly', async () => {
const paginationOptions: StoreQueryValidator = {
page: '3',
limit: '20',
};

jest
.spyOn(appService, 'getDashboardData')
.mockResolvedValue(mockStoreResponse);

const result = await appController.getDashboardData(paginationOptions);

expect(result).toEqual(mockStoreResponse);
expect(appService.getDashboardData).toHaveBeenCalledWith(
paginationOptions,
);
});
});
});
6 changes: 0 additions & 6 deletions backend/src/app.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { Controller, Get, Query } from '@nestjs/common';
import { SkipAuth } from './decorators/skip-auth.decorator';
import { StateQueryValidator } from './modules/state/dto/state.dto';
import { PhaseQueryValidator } from './modules/phase/dto/phase.dto';
import { StoreQueryValidator } from './modules/store/dto/store.dto';

@Controller()
export class AppController {
Expand All @@ -30,9 +29,4 @@ export class AppController {
async getPhases(@Query() queryOptions: PhaseQueryValidator) {
return this.appService.getPhases(queryOptions);
}

@Get('dashboard')
async getDashboardData(@Query() queryOptions: StoreQueryValidator) {
return this.appService.getDashboardData(queryOptions);
}
}
10 changes: 6 additions & 4 deletions backend/src/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,18 @@ import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConne
try {
await tempDataSource.initialize();
logger.log('Connected to postgres database for database creation');

await tempDataSource.query(
`CREATE DATABASE "${pgOptions.database}" OWNER "${pgOptions.username}"`,
);
logger.log(`Database ${pgOptions.database} created successfully`);

await tempDataSource.destroy();

return mainDataSource.initialize().then((ds) => {
logger.log('Main Data Source initialized after database creation');
logger.log(
'Main Data Source initialized after database creation',
);
return ds;
});
} catch (error) {
Expand Down
18 changes: 16 additions & 2 deletions backend/src/database/base/base.model-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,22 @@ export abstract class AbstractModelAction<T extends ObjectLiteral> {
? transactionOptions.transaction.getRepository(this.model)
: this.repository;

await modelRepository.update(identifierOptions, updatePayload);
return await modelRepository.findOne({ where: identifierOptions });
const updateResult = await modelRepository.update(
identifierOptions,
updatePayload,
);

if (updateResult.affected === 0) {
return null;
}

const idField =
'id' in identifierOptions
? { id: identifierOptions.id }
: identifierOptions;
return await modelRepository.findOne({
where: idField as FindOptionsWhere<T>,
});
}

async delete(deleteRecordOptions: DeleteGenericRecord<FindOptionsWhere<T>>) {
Expand Down
Loading