@defra-fish/dynamics-lib 1.68.0 → 1.69.0-rc.0

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@defra-fish/dynamics-lib",
-  "version": "1.68.0",
+  "version": "1.69.0-rc.0",
   "description": "Framework to support integration with dynamics",
   "type": "module",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "keywords": [
     "rod",
@@ -43,5 +43,5 @@
     "simple-oauth2": "4.3.0",
     "uuid": "8.3.2"
   },
-  "gitHead": "06c0080280b167f83b426a645e187c819390de4b"
+  "gitHead": "e9eb67926528361d45ad630df84da2ad47723b97"
 }

package/src/entities/__tests__/rcr-activity.entity.spec.js

@@ -0,0 +1,42 @@
+import { Contact, RCRActivity, RCR_ACTIVITY_STATUS } from '../../index.js'
+
+describe('rcr activity entity', () => {
+  it('maps from dynamics', async () => {
+    const rcrActivity = RCRActivity.fromResponse({
+      activityid: '1',
+      defra_activitystatus: RCR_ACTIVITY_STATUS.STARTED,
+      defra_season: 2025,
+      actualstart: '2020-03-31T22:59:00Z',
+      modifiedon: '2020-03-31T22:59:00Z',
+      actualend: '2020-03-31T22:59:00Z'
+    })
+
+    expect(rcrActivity.id).toBe('1')
+    expect(rcrActivity.status).toBe(RCR_ACTIVITY_STATUS.STARTED)
+    expect(rcrActivity.season).toBe(2025)
+    expect(rcrActivity.startDate).toBe('2020-03-31T22:59:00Z')
+    expect(rcrActivity.lastUpdated).toBe('2020-03-31T22:59:00Z')
+    expect(rcrActivity.submittedDate).toBe('2020-03-31T22:59:00Z')
+  })
+
+  it('maps to dynamics', async () => {
+    const rcrActivity = new RCRActivity()
+    rcrActivity.status = RCR_ACTIVITY_STATUS.SUBMITTED
+    rcrActivity.season = 2025
+    rcrActivity.startDate = '2020-03-31T22:59:00Z'
+    rcrActivity.submittedDate = '2020-03-31T22:59:00Z'
+
+    const contact = new Contact()
+    rcrActivity.bindToEntity(RCRActivity.definition.relationships.licensee, contact)
+
+    const expectedFields = {
+      actualend: '2020-03-31T22:59:00Z',
+      actualstart: '2020-03-31T22:59:00Z',
+      defra_activitystatus: RCR_ACTIVITY_STATUS.SUBMITTED,
+      defra_season: 2025,
+      'regardingobjectid_contact_defra_rcractivity@odata.bind': `$${contact.uniqueContentId}`
+    }
+
+    expect(rcrActivity.toRequestBody()).toStrictEqual(expectedFields)
+  })
+})

package/src/entities/rcr-activity.entity.js

@@ -0,0 +1,95 @@
+import { BaseEntity, EntityDefinition } from './base.entity.js'
+import { Contact } from './contact.entity.js'
+
+export const RCR_ACTIVITY_STATUS = Object.freeze({
+  STARTED: 910400000,
+  SUBMITTED: 910400001
+})
+
+/**
+ * RCRActivity entity
+ * @extends BaseEntity
+ */
+export class RCRActivity extends BaseEntity {
+  /** @type {EntityDefinition} */
+  static _definition = new EntityDefinition(() => ({
+    localName: 'rcrActivity',
+    dynamicsCollection: 'defra_rcractivities',
+    defaultFilter: 'statecode eq 0',
+    mappings: {
+      id: { field: 'activityid', type: 'string' },
+      status: { field: 'defra_activitystatus', type: 'integer' },
+      season: { field: 'defra_season', type: 'integer' },
+      startDate: { field: 'actualstart', type: 'datetime' },
+      lastUpdated: { field: 'modifiedon', type: 'datetime' },
+      submittedDate: { field: 'actualend', type: 'datetime' }
+    },
+    relationships: {
+      licensee: { property: 'regardingobjectid_contact_defra_rcractivity', entity: Contact, parent: true }
+    }
+  }))
+
+  /**
+   * The {@link EntityDefinition} providing mappings between Dynamics entity and the local entity
+   * @type {EntityDefinition}
+   */
+  static get definition () {
+    return RCRActivity._definition
+  }
+
+  /**
+   * The status associated with the rcr activity
+   * @type {RCR_ACTIVITY_STATUS}
+   */
+  get status () {
+    return super._getState('status')
+  }
+
+  set status (status) {
+    super._setState('status', status)
+  }
+
+  /**
+   * The season associated with the rcr activity
+   * @type {number}
+   */
+  get season () {
+    return super._getState('season')
+  }
+
+  set season (season) {
+    super._setState('season', season)
+  }
+
+  /**
+   * The start date associated with the rcr activity
+   * @type {date}
+   */
+  get startDate () {
+    return super._getState('startDate')
+  }
+
+  set startDate (startDate) {
+    super._setState('startDate', startDate)
+  }
+
+  /**
+   * The last updated date associated with the rcr activity
+   * @type {date}
+   */
+  get lastUpdated () {
+    return super._getState('lastUpdated')
+  }
+
+  /**
+   * The submitted date associated with the rcr activity
+   * @type {date}
+   */
+  get submittedDate () {
+    return super._getState('submittedDate')
+  }
+
+  set submittedDate (submittedDate) {
+    super._setState('submittedDate', submittedDate)
+  }
+}

package/src/index.js

@@ -13,6 +13,7 @@ export * from './entities/transaction-currency.entity.js'
 export * from './entities/pocl-file.entity.js'
 export * from './entities/pocl-staging-exception.entity.js'
 export * from './entities/pocl-validation-error.entity.js'
+export * from './entities/rcr-activity.entity.js'
 export * from './entities/recurring-payment.entity.js'
 export * from './entities/recurring-payment-instruction.entity.js'
 export * from './entities/staging-exception.entity.js'
@@ -28,7 +29,7 @@ export * from './queries/concession-proof.queries.js'
 export * from './queries/pocl-validation-error.queries.js'
 export * from './queries/recurring-payments.queries.js'
 export * from './queries/contact.queries.js'
-export * from './queries/activity.queries.js'
+export * from './queries/rcr-activity.queries.js'
 
 // Framework functionality
 export * from './client/util.js'

package/src/queries/__tests__/contact.queries.spec.js

@@ -1,6 +1,6 @@
-import { contactForLicensee, contactForLicenseeNoReference } from '../contact.queries.js'
-import { dynamicsClient } from '../../client/dynamics-client.js'
+import { contactAndPermissionForLicensee, contactForLicenseeNoReference } from '../contact.queries.js'
 import { Contact } from '../../entities/contact.entity.js'
+import { Permission } from '../../entities/permission.entity.js'
 import { PredefinedQuery } from '../predefined-query.js'
 
 jest.mock('dynamics-web-api', () => {
@@ -12,94 +12,6 @@ jest.mock('dynamics-web-api', () => {
 })
 
 describe('Contact Queries', () => {
-  describe('contactForLicensee', () => {
-    const mockResponse = {
-      ContactId: 'f1bb733e-3b1e-ea11-a810-000d3a25c5d6',
-      FirstName: 'Fester',
-      LastName: 'Tester',
-      DateOfBirth: '9/13/1946 12:00:00 AM',
-      Premises: '47',
-      Street: null,
-      Town: 'Testerton',
-      Locality: null,
-      Postcode: 'AB12 3CD',
-      ReturnStatus: 'success',
-      SuccessMessage: 'contact found successfully',
-      ErrorMessage: null,
-      ReturnPermissionNumber: '11100420-2WT1SFT-KPMW2C',
-      oDataContext: 'https://api.com/api/data/v9.1/$metadata#Microsoft.Dynamics.CRM.defra_GetContactByLicenceAndPostcodeResponse'
-    }
-
-    const noContactResponse = {
-      ContactId: null,
-      FirstName: null,
-      LastName: null,
-      DateOfBirth: null,
-      Premises: null,
-      Street: null,
-      Town: null,
-      Locality: null,
-      Postcode: null,
-      ReturnStatus: 'error',
-      SuccessMessage: '',
-      ErrorMessage: 'contact does not exists',
-      ReturnPermissionNumber: null,
-      oDataContext:
-        'https://api.crm4.dynamics.com/api/data/v9.1/$metadata#Microsoft.Dynamics.CRM.defra_GetContactByLicenceAndPostcodeResponse'
-    }
-
-    it('should call dynamicsClient with correct parameters', async () => {
-      dynamicsClient.executeUnboundAction.mockResolvedValue(mockResponse)
-
-      const permissionNumber = 'KPMW2C'
-      const postcode = 'AB12 3CD'
-
-      await contactForLicensee(permissionNumber, postcode)
-
-      expect(dynamicsClient.executeUnboundAction).toHaveBeenCalledWith('defra_GetContactByLicenceAndPostcode', {
-        PermissionNumber: permissionNumber,
-        InputPostCode: postcode
-      })
-    })
-
-    it('should return the CRM response correctly', async () => {
-      dynamicsClient.executeUnboundAction.mockResolvedValue(mockResponse)
-
-      const result = await contactForLicensee('KPMW2C', 'AB12 3CD')
-
-      expect(result).toEqual(mockResponse)
-    })
-
-    it('should handle error in dynamicsClient response', async () => {
-      const error = new Error('Failed to fetch data')
-      dynamicsClient.executeUnboundAction.mockRejectedValue(error)
-
-      await expect(contactForLicensee('KPMW2C', 'AB12 3CD')).rejects.toThrow('Failed to fetch data')
-    })
-
-    it('should handle the case where contact does not exist', async () => {
-      dynamicsClient.executeUnboundAction.mockResolvedValue(noContactResponse)
-
-      const result = await contactForLicensee('654321', 'ZZ1 1ZZ')
-
-      expect(result).toMatchObject({
-        ContactId: null,
-        FirstName: null,
-        LastName: null,
-        DateOfBirth: null,
-        Premises: null,
-        Street: null,
-        Town: null,
-        Locality: null,
-        Postcode: null,
-        ReturnStatus: 'error',
-        SuccessMessage: '',
-        ErrorMessage: 'contact does not exists',
-        ReturnPermissionNumber: null
-      })
-    })
-  })
-
   describe('contactForLicenseeNoReference', () => {
     beforeEach(() => {
       jest.resetAllMocks()
@@ -145,4 +57,85 @@ describe('Contact Queries', () => {
       })
     })
   })
+
+  describe('contactAndPermissionForLicensee', () => {
+    beforeEach(() => {
+      jest.resetAllMocks()
+
+      jest.spyOn(Contact.definition, 'mappings', 'get').mockReturnValue({
+        id: { field: 'contactid' },
+        postcode: { field: 'defra_postcode' }
+      })
+    })
+
+    it('should return a predefined query', () => {
+      const result = contactAndPermissionForLicensee('ABC123', 'AB12 3CD')
+      expect(result).toBeInstanceOf(PredefinedQuery)
+    })
+
+    it('root should return Permission', () => {
+      const result = contactAndPermissionForLicensee('ABC123', 'AB12 3CD')
+      expect(result._root).toEqual(Permission)
+    })
+
+    it('should build correct filter', () => {
+      const result = contactAndPermissionForLicensee('ABC123', 'AB12 3CD')
+
+      expect(result._retrieveRequest.filter).toEqual(
+        "endswith(defra_name, 'ABC123') and statecode eq 0 and defra_ContactId/defra_postcode eq 'AB12 3CD'"
+      )
+    })
+
+    it('should build correct orderBy', () => {
+      const result = contactAndPermissionForLicensee('ABC123', 'AB12 3CD')
+
+      expect(result._retrieveRequest.orderBy).toEqual(['defra_issuedate desc', 'defra_ContactId/contactid asc'])
+    })
+
+    it('should set expand correctly', () => {
+      const result = contactAndPermissionForLicensee('ABC123', 'AB12 3CD')
+
+      expect(result._retrieveRequest.expand).toEqual([
+        {
+          property: 'defra_ContactId',
+          select: ['contactid', 'defra_postcode']
+        }
+      ])
+    })
+
+    it.each([
+      ['XYZ999', 'EF45 6GH'],
+      ['123ABC', 'IJ78 9KL'],
+      ['AAAAAA', 'ZZ99 9ZZ']
+    ])(
+      'should return correct retrieve request when the last 6 characters of the permission is %s and postcode is %s',
+      (permissionLast6, postcode) => {
+        const result = contactAndPermissionForLicensee(permissionLast6, postcode)
+
+        expect(result._retrieveRequest).toEqual({
+          collection: 'defra_permissions',
+          filter: `endswith(defra_name, '${permissionLast6}') and statecode eq 0 and defra_ContactId/defra_postcode eq '${postcode}'`,
+          orderBy: ['defra_issuedate desc', 'defra_ContactId/contactid asc'],
+          expand: [
+            {
+              property: 'defra_ContactId',
+              select: ['contactid', 'defra_postcode']
+            }
+          ],
+          select: [
+            'defra_permissionid',
+            'defra_name',
+            'defra_issuedate',
+            'defra_startdate',
+            'defra_enddate',
+            'defra_stagingid',
+            'defra_datasource',
+            'defra_renewal',
+            'defra_rcpagreement',
+            'defra_licenceforyou'
+          ]
+        })
+      }
+    )
+  })
 })

package/src/queries/__tests__/rcr-activity.queries.spec.js

@@ -0,0 +1,48 @@
+import { RCRActivity } from '../../entities/rcr-activity.entity.js'
+import { PredefinedQuery } from '../predefined-query.js'
+import { rcrActivityForContact } from '../rcr-activity.queries.js'
+
+describe('rcrActivityForContact', () => {
+  beforeEach(() => {
+    jest.resetAllMocks()
+  })
+
+  it('should return a predefined query', () => {
+    const result = rcrActivityForContact('CONTACT123', 2024)
+    expect(result).toBeInstanceOf(PredefinedQuery)
+  })
+
+  it('root should return RCRActivity', () => {
+    const result = rcrActivityForContact('CONTACT123', 2024)
+    expect(result._root).toEqual(RCRActivity)
+  })
+
+  it('should build correct filter', () => {
+    const result = rcrActivityForContact('CONTACT123', 2024)
+
+    expect(result._retrieveRequest.filter).toEqual(
+      "regardingobjectid_contact_defra_rcractivity/contactid eq 'CONTACT123' and defra_season eq 2024 and statecode eq 0"
+    )
+  })
+
+  it('should set expand to empty array', () => {
+    const result = rcrActivityForContact('CONTACT123', 2024)
+
+    expect(result._retrieveRequest.expand).toEqual([])
+  })
+
+  it.each([
+    ['ABC123', 2023],
+    ['XYZ999', 2024],
+    ['AAAAAA', 2025]
+  ])('should return correct retrieve request when contactId is %s and season is %s', (contactId, season) => {
+    const result = rcrActivityForContact(contactId, season)
+
+    expect(result._retrieveRequest).toEqual({
+      collection: 'defra_rcractivities',
+      filter: `regardingobjectid_contact_defra_rcractivity/contactid eq '${contactId}' and defra_season eq ${season} and statecode eq 0`,
+      expand: [],
+      select: ['activityid', 'defra_activitystatus', 'defra_season', 'actualstart', 'modifiedon', 'actualend']
+    })
+  })
+})

package/src/queries/contact.queries.js

@@ -1,42 +1,8 @@
-import { dynamicsClient } from '../client/dynamics-client.js'
 import { Contact } from '../entities/contact.entity.js'
+import { Permission } from '../entities/permission.entity.js'
 import { escapeODataStringValue } from '../client/util.js'
 import { PredefinedQuery } from './predefined-query.js'
 
-/**
- * @typedef {Object} ContactByLicenceAndPostcode
- * @property {string|null} ContactId - The contact's unique identifier
- * @property {string|null} FirstName - The contact's first name
- * @property {string|null} LastName - The contact's last name
- * @property {string|null} DateOfBirth - The contact's date of birth
- * @property {string|null} Street - The contact's street
- * @property {string|null} Town - The contact's town
- * @property {string|null} Locality - The contact's locality
- * @property {string|null} Postcode - The contact's postcode
- * @property {string} ReturnStatus - The status of the request (e.g., "success" or "error")
- * @property {string|null} SuccessMessage - A success message if the contact is found
- * @property {string|null} ErrorMessage - An error message if the contact is not found
- * @property {string|null} ReturnPermissionNumber - The full permission number of the contact
- * @property {string} oDataContext - The OData context URL
- */
-
-/**
- * Calls the defra_GetContactByLicenceAndPostcode CRM plugin to retrieve a contact by the last 6 characters if their license number and postcode
- *
- * @param permissionReferenceNumberLast6Characters the last 6 characters of the permission reference number
- * @param licenseePostcode the postcode of the contact associated with the permission
- * @returns {Promise<ContactByLicenceAndPostcode>}
- */
-
-export const contactForLicensee = (permissionReferenceNumberLast6Characters, licenseePostcode) => {
-  const request = {
-    PermissionNumber: permissionReferenceNumberLast6Characters,
-    InputPostCode: licenseePostcode
-  }
-
-  return dynamicsClient.executeUnboundAction('defra_GetContactByLicenceAndPostcode', request)
-}
-
 export const contactForLicenseeNoReference = (licenseeBirthDate, licenseePostcode) => {
   const { postcode, birthDate } = Contact.definition.mappings
   const filter = `${postcode.field} eq '${escapeODataStringValue(licenseePostcode)}' and ${birthDate.field} eq ${licenseeBirthDate} and ${
@@ -48,3 +14,37 @@ export const contactForLicenseeNoReference = (licenseeBirthDate, licenseePostcod
     expand: []
   })
 }
+
+/**
+ * Gets the query to get a contact by the last 6 characters if their license number and postcode
+ *
+ * @param {string} permissionLast6Characters the last 6 characters of the permission reference number
+ * @param {string} licenseePostcode the postcode of the contact associated with the permission
+ * @returns {PredefinedQuery<Permission>} returns a query as an object to fetch the contact
+ */
+
+export const contactAndPermissionForLicensee = (permissionLast6Characters, licenseePostcode) => {
+  const { referenceNumber, issueDate } = Permission.definition.mappings
+  const { licensee } = Permission.definition.relationships
+  const { id } = Contact.definition.mappings
+
+  const filter = `endswith(${referenceNumber.field}, '${escapeODataStringValue(permissionLast6Characters)}') and ${
+    Permission.definition.defaultFilter
+  } and ${licensee.property}/${Contact.definition.mappings.postcode.field} eq '${escapeODataStringValue(licenseePostcode)}'`
+  const orderBy = [`${issueDate.field} desc`, `${licensee.property}/${id.field} asc`]
+
+  const query = new PredefinedQuery({
+    root: Permission,
+    filter,
+    orderBy
+  })
+
+  query._retrieveRequest.expand = [
+    {
+      property: Permission.definition.relationships.licensee.property,
+      select: [Contact.definition.mappings.id.field, Contact.definition.mappings.postcode.field]
+    }
+  ]
+
+  return query
+}

package/src/queries/rcr-activity.queries.js

@@ -0,0 +1,27 @@
+import { Contact } from '../entities/contact.entity.js'
+import { RCRActivity } from '../entities/rcr-activity.entity.js'
+import { escapeODataStringValue } from '../client/util.js'
+import { PredefinedQuery } from './predefined-query.js'
+
+/**
+ * Creates a predefined OData query for retrieving {@link RCRActivity} records
+ * associated with a specific contact id and season.
+ *
+ * @param {string} contactId The unique identifier of the {@link Contact}.
+ * @param {string|number} seasonInput The season value to filter activities by.
+ * @returns {PredefinedQuery<RCRActivity>} returns a query as an object to fetch the contact
+ */
+export const rcrActivityForContact = (contactId, seasonInput) => {
+  const { season } = RCRActivity.definition.mappings
+  const { licensee } = RCRActivity.definition.relationships
+  const { id } = Contact.definition.mappings
+
+  const filter = `${licensee.property}/${id.field} eq '${escapeODataStringValue(contactId)}' and ${
+    season.field
+  } eq ${escapeODataStringValue(seasonInput)} and ${RCRActivity.definition.defaultFilter}`
+  return new PredefinedQuery({
+    root: RCRActivity,
+    filter,
+    expand: []
+  })
+}

package/src/queries/__tests__/activity.queries.spec.js

@@ -1,133 +0,0 @@
-import { createActivity, updateActivity } from '../activity.queries.js'
-import { dynamicsClient } from '../../client/dynamics-client.js'
-
-jest.mock('dynamics-web-api', () => {
-  return jest.fn().mockImplementation(() => {
-    return {
-      executeUnboundAction: jest.fn()
-    }
-  })
-})
-
-describe('Activity Service', () => {
-  describe('createActivity', () => {
-    const getSuccessResponse = () => ({
-      '@odata.context': 'https://dynamics.com/api/data/v9.1/defra_CreateRCRActivityResponse',
-      RCRActivityId: 'abc123',
-      ReturnStatus: 'success',
-      SuccessMessage: 'RCR Activity - created successfully',
-      ErrorMessage: null,
-      oDataContext: 'https://dynamics.com/api/data/v9.1/defra_CreateRCRActivityResponse'
-    })
-
-    const getErrorResponse = () => ({
-      '@odata.context': 'https://dynamics.com/api/data/v9.1/.defra_CreateRCRActivityResponse',
-      RCRActivityId: null,
-      ReturnStatus: 'error',
-      SuccessMessage: '',
-      ErrorMessage: 'Failed to create activity',
-      oDataContext: 'https://dynamics.com/api/data/v9.1/$metadata#Microsoft.Dynamics.CRM.defra_CreateRCRActivityResponse'
-    })
-
-    it('should call dynamicsClient with correct parameters', async () => {
-      dynamicsClient.executeUnboundAction.mockResolvedValue(getSuccessResponse())
-
-      await createActivity('contact-identifier-123', 2023)
-
-      expect(dynamicsClient.executeUnboundAction).toHaveBeenCalledWith('defra_CreateRCRActivity', {
-        ContactId: 'contact-identifier-123',
-        ActivityStatus: 'STARTED',
-        Season: 2023
-      })
-    })
-
-    it('should return the CRM response correctly', async () => {
-      const successResponse = getSuccessResponse()
-      dynamicsClient.executeUnboundAction.mockResolvedValue(successResponse)
-
-      const result = await createActivity('contact-identifier-123', 2024)
-
-      expect(result).toEqual(successResponse)
-    })
-
-    it('should handle error in dynamicsClient response', async () => {
-      const error = new Error('Failed to create activity')
-      dynamicsClient.executeUnboundAction.mockRejectedValue(error)
-
-      await expect(createActivity('contact-identifier-123', 2024)).rejects.toThrow('Failed to create activity')
-    })
-
-    it('should handle the case where activity creation fails', async () => {
-      dynamicsClient.executeUnboundAction.mockResolvedValue(getErrorResponse())
-
-      const result = await createActivity('invalid-contact-id', 2024)
-
-      expect(result).toMatchObject({
-        RCRActivityId: null,
-        ReturnStatus: 'error',
-        SuccessMessage: '',
-        ErrorMessage: 'Failed to create activity'
-      })
-    })
-  })
-
-  describe('updateActivity', () => {
-    const getSuccessResponse = () => ({
-      '@odata.context': 'https://dynamics.om/api/data/v9.1/defra_UpdateRCRActivityResponse',
-      ReturnStatus: 'success',
-      SuccessMessage: 'RCR Activity - updated successfully',
-      ErrorMessage: null,
-      oDataContext: 'https://dynamics.com/api/data/v9.1/defra_UpdateRCRActivityResponse'
-    })
-
-    const getErrorResponse = () => ({
-      '@odata.context': 'https://dynamics.om/api/data/v9.1/defra_UpdateRCRActivityResponse',
-      RCRActivityId: null,
-      ReturnStatus: 'error',
-      SuccessMessage: '',
-      ErrorMessage: 'Failed to update activity',
-      oDataContext: 'https://dynamics.com/api/data/v9.1/defra_UpdateRCRActivityResponse'
-    })
-
-    it('should call dynamicsClient with correct parameters', async () => {
-      dynamicsClient.executeUnboundAction.mockResolvedValue(getSuccessResponse())
-
-      await updateActivity('contact-identifier-123', 2023)
-
-      expect(dynamicsClient.executeUnboundAction).toHaveBeenCalledWith('defra_UpdateRCRActivity', {
-        ContactId: 'contact-identifier-123',
-        ActivityStatus: 'SUBMITTED',
-        Season: 2023
-      })
-    })
-
-    it('should return the CRM response correctly', async () => {
-      const successResponse = getSuccessResponse()
-      dynamicsClient.executeUnboundAction.mockResolvedValue(successResponse)
-
-      const result = await updateActivity('contact-identifier-123', 2024)
-
-      expect(result).toEqual(successResponse)
-    })
-
-    it('should handle error in dynamicsClient response', async () => {
-      const error = new Error('Failed to update activity')
-      dynamicsClient.executeUnboundAction.mockRejectedValue(error)
-
-      await expect(updateActivity('contact-identifier-123', 2024)).rejects.toThrow('Failed to update activity')
-    })
-
-    it('should handle the case where activity creation fails', async () => {
-      dynamicsClient.executeUnboundAction.mockResolvedValue(getErrorResponse())
-
-      const result = await updateActivity('invalid-contact-id', 2024)
-
-      expect(result).toMatchObject({
-        RCRActivityId: null,
-        ReturnStatus: 'error',
-        SuccessMessage: '',
-        ErrorMessage: 'Failed to update activity'
-      })
-    })
-  })
-})

package/src/queries/activity.queries.js

@@ -1,47 +0,0 @@
-import { dynamicsClient } from '../client/dynamics-client.js'
-
-/**
- * Creates an RCR Activity in Microsoft Dynamics CRM.
- *
- * @param {string} contactId - The ID of the contact associated with the activity.
- * @param {number} season - The season year for which the activity is being created.
- * @returns {Promise<Object>} - A promise that resolves to the response from Dynamics CRM.
- * @property {string} response.@odata.context - The OData context URL of the response.
- * @property {string} response.RCRActivityId - The unique identifier of the created RCR activity.
- * @property {string} response.ReturnStatus - The status of the activity creation operation (e.g., 'success').
- * @property {string} response.SuccessMessage - A message indicating successful creation of the activity.
- * @property {string|null} response.ErrorMessage - An error message if the activity creation failed, otherwise null.
- * @property {string} response.oDataContext - The OData context URL of the response.
- */
-export const createActivity = (contactId, season) => {
-  const request = {
-    ContactId: contactId,
-    ActivityStatus: 'STARTED',
-    Season: season
-  }
-
-  return dynamicsClient.executeUnboundAction('defra_CreateRCRActivity', request)
-}
-
-/**
- * Updates an RCR Activity in Microsoft Dynamics CRM.
- *
- * @param {string} contactId - The ID of the contact associated with the activity.
- * @param {number} season - The season year for which the activity is being created.
- * @returns {Promise<Object>} - A promise that resolves to the response from Dynamics CRM.
- * @property {string} response.@odata.context - The OData context URL of the response.
- * @property {string} response.RCRActivityId - The unique identifier of the created RCR activity.
- * @property {string} response.ReturnStatus - The status of the activity creation operation (e.g., 'success').
- * @property {string} response.SuccessMessage - A message indicating successful creation of the activity.
- * @property {string|null} response.ErrorMessage - An error message if the activity creation failed, otherwise null.
- * @property {string} response.oDataContext - The OData context URL of the response.
- */
-export const updateActivity = (contactId, season) => {
-  const request = {
-    ContactId: contactId,
-    ActivityStatus: 'SUBMITTED',
-    Season: season
-  }
-
-  return dynamicsClient.executeUnboundAction('defra_UpdateRCRActivity', request)
-}