Application dates configurable (#124)

Author: sezanzeb

backend/src/controllers/dto.ts

@@ -34,6 +34,7 @@ import {
   EmailTemplateSize,
   FrontendSettings,
   Settings,
+  ProjectSettings,
 } from "../entities/settings";
 import { User } from "../entities/user";
 import { UserRole } from "../entities/user-role";
@@ -91,6 +92,17 @@ export class ApplicationSettingsDTO implements DTO<ApplicationSettings> {
   @IsNumber()
   @Expose()
   public hoursToConfirm!: number;
+  @Type(() => Date)
+  @IsDate()
+  @Expose()
+  public acceptanceDeadline!: Date;
+  @Type(() => Date)
+  @IsDate()
+  @Expose()
+  public confirmSpotUntil!: Date;
+}
+
+export class ProjectSettingsDTO implements DTO<ProjectSettings> {
   @IsBoolean()
   @Expose()
   public allowRatingProjects!: boolean;
@@ -166,6 +178,10 @@ export class SettingsDTO implements DTO<Omit<Settings, "updatedAt">> {
   @ValidateNested()
   @Expose()
   public email!: EmailSettingsDTO;
+  @Type(() => ProjectSettingsDTO)
+  @ValidateNested()
+  @Expose()
+  public project!: ProjectSettingsDTO;
 }
 
 export abstract class QuestionConfigurationDTOBase {

backend/src/entities/application-settings.ts

@@ -11,6 +11,9 @@ import { FormSettings } from "./form-settings";
 // TODO all other settings are part of the settings table, whereas ApplicationSettings
 //  is a separate table. Move into settings table just like EmailSettings.
 
+/**
+ * Application as in "Peoples application for the event"
+ */
 @Entity()
 export class ApplicationSettings {
   @PrimaryGeneratedColumn()
@@ -29,6 +32,8 @@ export class ApplicationSettings {
   public allowProfileFormUntil!: Date;
   @Column()
   public hoursToConfirm!: number;
-  @Column({ default: false })
-  public allowRatingProjects!: boolean;
+  @Column({ default: () => "CURRENT_TIMESTAMP" })
+  public acceptanceDeadline!: Date;
+  @Column({ default: () => "CURRENT_TIMESTAMP" })
+  public confirmSpotUntil!: Date;
 }

backend/src/entities/settings.ts

@@ -48,6 +48,11 @@ export class EmailSettings {
   public forgotPasswordEmail!: EmailTemplate;
 }
 
+export class ProjectSettings {
+  @Column({ default: false })
+  public allowRatingProjects!: boolean;
+}
+
 @Entity()
 export class Settings {
   @PrimaryGeneratedColumn()
@@ -64,6 +69,9 @@ export class Settings {
   @Type(() => EmailSettings)
   @Column(() => EmailSettings)
   public email!: EmailSettings;
+  @Type(() => ProjectSettings)
+  @Column(() => ProjectSettings)
+  public project!: ProjectSettings;
 }
 
 /**

backend/src/services/project-service.ts

@@ -72,7 +72,7 @@ export class ProjectService implements IProjectService {
       .map((team) => team.id);
 
     const [settings] = await this._settings.find();
-    const allowRatingProjects = settings.application.allowRatingProjects;
+    const allowRatingProjects = settings.project.allowRatingProjects;
     const isAdmin = user.role === UserRole.Root;
 
     const projects = await this._projects.find();

backend/src/services/rating-service.ts

@@ -236,10 +236,8 @@ export class RatingService implements IRatingService {
     }
 
     const settings = await this._settings.getSettings();
-    if (!settings.application.allowRatingProjects) {
-      throw new ForbiddenError(
-        "Rating is not allowed due to application settings",
-      );
+    if (!settings.project.allowRatingProjects) {
+      throw new ForbiddenError("Rating is not allowed due to settings");
     }
 
     const project = await this._projects.findOneBy({ id: rating.project.id });

backend/src/services/settings-service.ts

@@ -9,6 +9,7 @@ import {
   EmailTemplate,
   FrontendSettings,
   Settings,
+  ProjectSettings,
 } from "../entities/settings";
 import {
   ConfigurationServiceToken,
@@ -102,6 +103,7 @@ export class SettingsService implements ISettingsService {
     settings.application = this.getDefaultApplicationSettings();
     settings.frontend = this.getDefaultFrontendSettings();
     settings.email = this.getDefaultEmailSettings();
+    settings.project = this.getDefaultProjectSettings();
     return settings;
   }
 
@@ -115,10 +117,20 @@ export class SettingsService implements ISettingsService {
     applicationSettings.allowProfileFormFrom = new Date();
     applicationSettings.allowProfileFormUntil = new Date();
     applicationSettings.hoursToConfirm = 24;
-    applicationSettings.allowRatingProjects = false;
+    applicationSettings.acceptanceDeadline = new Date();
+    applicationSettings.confirmSpotUntil = new Date();
     return applicationSettings;
   }
 
+  /**
+   * Creates a project settings object with default values.
+   */
+  private getDefaultProjectSettings(): ProjectSettings {
+    const projectSettings = new ProjectSettings();
+    projectSettings.allowRatingProjects = false;
+    return projectSettings;
+  }
+
   /**
    * Creates a form settings object with default values.
    */

backend/test/services/mock/mock-settings-service.ts

@@ -25,7 +25,11 @@ export const defaultSettings = {
     },
     allowProfileFormFrom: new Date(),
     allowProfileFormUntil: new Date(),
+    acceptanceDeadline: new Date(),
+    confirmSpotUntil: new Date(),
     hoursToConfirm: 24,
+  },
+  project: {
     allowRatingProjects: false,
   },
   frontend: {

backend/test/services/project-service-get-all-projects.spec.ts

@@ -56,8 +56,8 @@ describe(ProjectService.name, () => {
     await settingsRepo.save([
       {
         ...defaultSettings,
-        application: {
-          ...defaultSettings.application,
+        project: {
+          ...defaultSettings.project,
           allowRatingProjects: false,
         },
       },
@@ -71,7 +71,7 @@ describe(ProjectService.name, () => {
   const allowRatingProjects = async (value: boolean): Promise<void> => {
     const settingsRepo = database.getRepository(Settings);
     const settings = {
-      application: {
+      project: {
         allowRatingProjects: value,
       },
     };

backend/test/services/rating-service.spec.ts

@@ -121,7 +121,7 @@ describe("RatingService", () => {
         expect.assertions(1);
 
         settingsService.mocks.getSettings.mockResolvedValue({
-          application: { allowRatingProjects: false },
+          project: { allowRatingProjects: false },
         } as any);
 
         const rating = Object.assign(new Rating(), {
@@ -140,7 +140,7 @@ describe("RatingService", () => {
         expect.assertions(1);
 
         settingsService.mocks.getSettings.mockResolvedValue({
-          application: { allowRatingProjects: true },
+          project: { allowRatingProjects: true },
         } as any);
 
         const rating = Object.assign(new Rating(), {
@@ -159,7 +159,7 @@ describe("RatingService", () => {
         expect.assertions(1);
 
         settingsService.mocks.getSettings.mockResolvedValue({
-          application: { allowRatingProjects: true },
+          project: { allowRatingProjects: true },
         } as any);
 
         await projectRepo.update(mockProject.id, { allowRating: false });
@@ -181,7 +181,7 @@ describe("RatingService", () => {
         expect.assertions(1);
 
         settingsService.mocks.getSettings.mockResolvedValue({
-          application: { allowRatingProjects: true },
+          project: { allowRatingProjects: true },
         } as any);
 
         const rating = Object.assign(new Rating(), {
@@ -200,7 +200,7 @@ describe("RatingService", () => {
         expect.assertions(2);
 
         settingsService.mocks.getSettings.mockResolvedValue({
-          application: { allowRatingProjects: true },
+          project: { allowRatingProjects: true },
         } as any);
 
         const rating = Object.assign(new Rating(), {
@@ -220,7 +220,7 @@ describe("RatingService", () => {
         expect.assertions(1);
 
         settingsService.mocks.getSettings.mockResolvedValue({
-          application: { allowRatingProjects: true },
+          project: { allowRatingProjects: true },
         } as any);
 
         const rating = Object.assign(new Rating(), {

frontend/src/api/index.ts

@@ -182,6 +182,12 @@ export class ApiClient {
         allowProfileFormUntil: this.reviveDate(
           settings.application.allowProfileFormUntil,
         ),
+        acceptanceDeadline: this.reviveDate(
+          settings.application.acceptanceDeadline,
+        ),
+        confirmSpotUntil: this.reviveDate(
+          settings.application.confirmSpotUntil,
+        ),
       },
     };
   }