feat(fa): Creating changebla month for financial-aid (#14974)

* adding sortable feature

* Revert "adding sortable feature"

This reverts commit d9691c5.

* adding more detail for api

* removing white space break just adding html element to the db

* adding applied

* when creating application

* use applied when applied

* creating modal

* wokring onf rontend for update date

* code review

* remvoing unused css

* applied month

* updateing spec

* update from code bunny

* updating test

* remvoing applied

* fixing migration

* test

* trying to make test work

* more test

* trying to get create test to work

* removing test to move on

* using now factory lets go

* testing lint

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

apps/financial-aid/api/src/app/modules/application/models/application.model.ts

@@ -26,6 +26,9 @@ export class ApplicationModel implements Application {
   @Field()
   readonly modified!: string
 
+  @Field()
+  readonly applied!: string
+
   @Field()
   readonly nationalId!: string
 

apps/financial-aid/backend/migrations/20240528122439-update-application-add-applied.js

@@ -0,0 +1,48 @@
+'use strict'
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    return queryInterface.sequelize.transaction(async (t) => {
+      // Add the new column
+      await queryInterface.addColumn(
+        'applications',
+        'applied',
+        {
+          type: Sequelize.DATE,
+          allowNull: true,
+        },
+        { transaction: t },
+      )
+
+      // Update the applied column with the createdAt date
+      await queryInterface.sequelize.query(
+        `
+          UPDATE applications
+          SET applied = created;
+        `,
+        { transaction: t },
+      )
+
+      // Change the column to not allow null values if necessary
+      await queryInterface.changeColumn(
+        'applications',
+        'applied',
+        {
+          type: Sequelize.DATE,
+          allowNull: false,
+        },
+        { transaction: t },
+      )
+    })
+  },
+
+  async down(queryInterface, Sequelize) {
+    return queryInterface.sequelize.transaction((t) =>
+      Promise.all([
+        queryInterface.removeColumn('applications', 'applied', {
+          transaction: t,
+        }),
+      ]),
+    )
+  },
+}

apps/financial-aid/backend/src/app/modules/application/application.service.ts

@@ -55,6 +55,7 @@ import { DeductionFactorsModel } from '../deductionFactors'
 import { DirectTaxPaymentService } from '../directTaxPayment'
 import { DirectTaxPaymentModel } from '../directTaxPayment/models'
 import { ChildrenModel, ChildrenService } from '../children'
+import { nowFactory } from './factories/date.factory'
 
 interface Recipient {
   name: string
@@ -146,7 +147,7 @@ export class ApplicationService {
             spouseNationalId: nationalId,
           },
         ],
-        created: { [Op.gte]: firstDateOfMonth() },
+        applied: { [Op.gte]: firstDateOfMonth() },
       },
     })
 
@@ -294,6 +295,7 @@ export class ApplicationService {
 
     const appModel = await this.applicationModel.create({
       ...application,
+      applied: nowFactory(),
       nationalId: application.nationalId || user.nationalId,
     })
 

apps/financial-aid/backend/src/app/modules/application/factories/date.factory.ts

@@ -0,0 +1 @@
+export const nowFactory = () => new Date()

apps/financial-aid/backend/src/app/modules/application/models/application.model.ts

@@ -49,6 +49,13 @@ export class ApplicationModel extends Model {
   @ApiProperty()
   modified: Date
 
+  @Column({
+    type: DataType.DATE,
+    allowNull: false,
+  })
+  @ApiProperty()
+  applied: Date
+
   @Column({
     type: DataType.STRING,
     allowNull: false,

apps/financial-aid/backend/src/app/modules/application/test/create.spec.ts

@@ -1,6 +1,7 @@
 import { EmailService } from '@island.is/email-service'
 import {
   ApplicationState,
+  ChildrenAid,
   Employment,
   FamilyStatus,
   FileType,
@@ -21,6 +22,8 @@ import { ApplicationModel } from '../models/application.model'
 import { createTestingApplicationModule } from './createTestingApplicationModule'
 import { DirectTaxPaymentService } from '../../directTaxPayment'
 import { ChildrenService } from '../../children'
+import { nowFactory } from '../factories/date.factory'
+jest.mock('../factories/date.factory')
 
 interface Then {
   result: ApplicationModel
@@ -80,6 +83,7 @@ describe('ApplicationController - Create', () => {
   describe('database query', () => {
     let mockCreate: jest.Mock
     let mockFindOne: jest.Mock
+    const date = new Date()
 
     const user: User = {
       nationalId: '0000000000',
@@ -121,6 +125,8 @@ describe('ApplicationController - Create', () => {
       applicationSystemId: '',
       nationalId: user.nationalId,
       spouseHasFetchedDirectTaxPayment: false,
+      children: [],
+      childrenComment: '',
     }
 
     beforeEach(async () => {
@@ -129,13 +135,17 @@ describe('ApplicationController - Create', () => {
       const mockFindApplication = mockApplicationModel.findOne as jest.Mock
       mockFindApplication.mockReturnValueOnce(null)
 
+      const mockToday = nowFactory as jest.Mock
+      mockToday.mockReturnValueOnce(date)
+
       await givenWhenThen(user, application)
     })
 
     it('should call create on model with application', () => {
       expect(mockCreate).toHaveBeenCalledWith({
         nationalId: user.nationalId,
         ...application,
+        applied: date,
       })
     })
 
@@ -150,7 +160,7 @@ describe('ApplicationController - Create', () => {
               spouseNationalId: user.nationalId,
             },
           ],
-          created: { [Op.gte]: firstDateOfMonth() },
+          applied: { [Op.gte]: firstDateOfMonth() },
         },
       })
     })
@@ -201,6 +211,8 @@ describe('ApplicationController - Create', () => {
       applicationSystemId: '',
       nationalId: user.nationalId,
       spouseHasFetchedDirectTaxPayment: false,
+      children: [],
+      childrenComment: '',
     }
 
     const municipality: Municipality = {
@@ -213,12 +225,14 @@ describe('ApplicationController - Create', () => {
       individualAid: undefined,
       cohabitationAid: undefined,
       usingNav: false,
+      childrenAid: ChildrenAid.NOTDEFINED,
     }
 
     const appModel = {
       id,
       state: application.state,
       created: new Date(),
+      applied: new Date(),
       email: application.email,
     }
 
@@ -323,6 +337,8 @@ describe('ApplicationController - Create', () => {
       applicationSystemId: null,
       nationalId: user.nationalId,
       spouseHasFetchedDirectTaxPayment: false,
+      children: [],
+      childrenComment: '',
     }
 
     const municipality: Municipality = {
@@ -335,12 +351,14 @@ describe('ApplicationController - Create', () => {
       individualAid: undefined,
       cohabitationAid: undefined,
       usingNav: false,
+      childrenAid: ChildrenAid.NOTDEFINED,
     }
 
     const appModel = {
       id,
       state: application.state,
       created: new Date(),
+      applied: new Date(),
       email: application.email,
       spouseEmail: application.spouseEmail,
       spouseName: application.spouseName,
@@ -437,12 +455,15 @@ describe('ApplicationController - Create', () => {
       applicationSystemId: '',
       nationalId: user.nationalId,
       spouseHasFetchedDirectTaxPayment: false,
+      children: [],
+      childrenComment: '',
     }
 
     const appModel = {
       id,
       state: application.state,
       created: new Date(),
+      applied: new Date(),
       email: application.email,
     }
 
@@ -532,6 +553,8 @@ describe('ApplicationController - Create', () => {
       applicationSystemId: '',
       nationalId: '',
       spouseHasFetchedDirectTaxPayment: false,
+      children: [],
+      childrenComment: '',
     }
     const user: User = {
       nationalId: '0000000000',
@@ -542,6 +565,7 @@ describe('ApplicationController - Create', () => {
       id,
       state: application.state,
       created: new Date(),
+      applied: new Date(),
       email: application.email,
     }
 
@@ -623,13 +647,8 @@ describe('ApplicationController - Create', () => {
       applicationSystemId: '',
       nationalId: user.nationalId,
       spouseHasFetchedDirectTaxPayment: false,
-    }
-
-    const appModel = {
-      id,
-      state: application.state,
-      created: new Date(),
-      email: application.email,
+      children: [],
+      childrenComment: '',
     }
 
     beforeEach(async () => {
@@ -687,6 +706,8 @@ describe('ApplicationController - Create', () => {
       applicationSystemId: '',
       nationalId: user.nationalId,
       spouseHasFetchedDirectTaxPayment: false,
+      children: [],
+      childrenComment: '',
     }
 
     beforeEach(async () => {

apps/financial-aid/backend/src/app/modules/application/test/getCurrentApplication.spec.ts

@@ -56,7 +56,7 @@ describe('ApplicationController - Get current application', () => {
               spouseNationalId: user.nationalId,
             },
           ],
-          created: { [Op.gte]: firstDateOfMonth() },
+          applied: { [Op.gte]: firstDateOfMonth() },
         },
       })
     })

apps/financial-aid/web-veita/graphql/sharedGql.ts

@@ -7,6 +7,7 @@ export const ApplicationQuery = gql`
       applicationSystemId
       nationalId
       created
+      applied
       modified
       name
       phoneNumber
@@ -208,6 +209,7 @@ export const ApplicationEventMutation = gql`
       nationalId
       created
       modified
+      applied
       name
       phoneNumber
       email
@@ -328,6 +330,7 @@ export const UpdateApplicationMutation = gql`
       nationalId
       created
       modified
+      applied
       name
       phoneNumber
       email

apps/financial-aid/web-veita/src/components/AppliedMonthModal/AppliedMonthModal.css.ts

@@ -0,0 +1,9 @@
+import { style } from '@vanilla-extract/css'
+
+export const modal = style({
+  display: 'block',
+  width: '100%',
+  maxWidth: '440px',
+  boxShadow: '0px 8px 32px rgba(0, 0, 0, 0.08)',
+  borderRadius: '12px',
+})