Skip to content

(Story) edit event details #347 #150

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.

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

Open
wants to merge 1 commit into
base: ottery-native
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 43 additions & 1 deletion src/features/core/event/event.controller.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Controller, Get, Param } from '@nestjs/common';
import { CreateEventDto, id, UserInfoDto, perm } from '@ottery/ottery-dto';
import { Body, Post, Query } from '@nestjs/common/decorators';
import { Body, Patch, Post, Query } from '@nestjs/common/decorators';
import { compareIds } from 'src/functions/compareIds';
import { SeshDocument } from 'src/features/auth/sesh/sesh.schema';
import { Sesh } from 'src/features/auth/sesh/Sesh.decorator';
Expand Down Expand Up @@ -144,4 +144,46 @@ export class EventController {
throw e;
}
}

@Patch(':eventId')
async update(
@Param('eventId') eventId: id,
@Body() createEventDto: CreateEventDto,
) {
try {
const event = await this.coreService.event.get(eventId);

const volForms = await this.formFieldService.createMany(
createEventDto.volenteerSignUp,
);
const atenForms = await this.formFieldService.createMany(
createEventDto.attendeeSignUp,
);
const guardianForms = await this.formFieldService.createMany(
createEventDto.guardianSignUp,
);

const volIds = volForms.map(({ _id }) => _id);
const atenIds = atenForms.map(({ _id }) => _id);
const guardianIds = guardianForms.map(({ _id }) => _id);

const updatedEvent = await this.coreService.event.update(eventId, {
...event,
...createEventDto,
volenteerSignUp: volIds,
attendeeSignUp: atenIds,
guardianSignUp: guardianIds,
});

await this.formFieldService.addEventToCustomForms(updatedEvent._id, [
...guardianIds,
...atenIds,
...volIds,
]);

return updatedEvent;
} catch (e) {
throw e;
}
}
}
11 changes: 8 additions & 3 deletions src/features/core/event/event.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,14 @@ export class EventService implements CrudService {

async update(eventId: id, event: Event) {
// overwrite is false so only modified fields are updated
return await this.eventModel
.findByIdAndUpdate(eventId, event)
.setOptions({ overwrite: false, new: true });
// return await this.eventModel
// .findByIdAndUpdate(eventId, event)
// .setOptions({ overwrite: false, new: true });

const eventDoc = await this.eventModel.findById(eventId);
Object.keys(event).forEach((key) => (eventDoc[key] = event[key]));
eventDoc.save();
return eventDoc;
}

async get(id: id) {
Expand Down
66 changes: 38 additions & 28 deletions src/features/form/form.controller.ts
Original file line number Diff line number Diff line change
@@ -1,38 +1,48 @@
import { Controller, Get, HttpException, HttpStatus, Query } from '@nestjs/common';
import {
Controller,
Get,
HttpException,
HttpStatus,
Query,
} from '@nestjs/common';
import { id } from '@ottery/ottery-dto';

import { FormFieldService } from './form.service';
import { FormFlag } from './form.flag.enum';

@Controller('api/form')
export class FormController {
constructor(
private formFieldService: FormFieldService,
) {}
constructor(private formFieldService: FormFieldService) {}

@Get('fields/default')
async getAllDefaultFormFields() {
try {
return await this.formFieldService.getAllDefault();
} catch (e) {
throw e;
}
}

@Get("fields/default")
async getAllDefaultFormFields() {
try {
return await this.formFieldService.getAllDefault();
} catch (e) {
throw e;
}
@Get('fields/base/required')
async getAllBaseRequiredField(@Query('flag') flag: FormFlag) {
if (!flag) {
throw new HttpException('needs flag query', HttpStatus.BAD_REQUEST);
}

@Get("fields/base/required")
async getAllBaseRequiredField(
@Query("flag") flag: FormFlag
) {
if (!flag) {
throw new HttpException(
"needs flag query",
HttpStatus.BAD_REQUEST,
)
}
try {
const forms = await this.formFieldService.getBaseFields();
return forms[flag];
} catch (e) {
throw e;
}
}

try {
const forms = await this.formFieldService.getBaseFields();
return forms[flag];
} catch (e) {
throw e;
}
@Get('fields')
async getFormFieldsByIds(@Query('ids') fieldIds: id[]) {
try {
return this.formFieldService.getMany(fieldIds);
} catch (e) {
throw e;
}
}
}
}