LF-3651 Revenue type table unique violation error on auto-incrementing primary key

packages/api/db/migration/20230831015743_create_revenue_type_table.js

@@ -31,20 +31,21 @@ export const up = async function (knex) {
   });
 
   // Prepopulate with one revenue type (crop_sale)
-  await knex('revenue_type').insert({
-    revenue_type_id: 1,
-    revenue_name: 'Crop Sale',
-    farm_id: null,
-    deleted: false,
-    created_by_user_id: '1',
-    updated_by_user_id: '1',
-    created_at: new Date('2000/1/1').toISOString(),
-    updated_at: new Date('2000/1/1').toISOString(),
-    revenue_translation_key: 'CROP_SALE',
-  });
+  const [cropSale] = await knex('revenue_type')
+    .insert({
+      revenue_name: 'Crop Sale',
+      farm_id: null,
+      deleted: false,
+      created_by_user_id: '1',
+      updated_by_user_id: '1',
+      created_at: new Date('2000/1/1').toISOString(),
+      updated_at: new Date('2000/1/1').toISOString(),
+      revenue_translation_key: 'CROP_SALE',
+    })
+    .returning('revenue_type_id');
 
   // Reference crop_sale type for all existing records
-  await knex('sale').update({ revenue_type_id: 1 });
+  await knex('sale').update({ revenue_type_id: cropSale.revenue_type_id });
 
   // Add  permissions
   await knex('permissions').insert([

packages/api/src/middleware/validation/sale.js

@@ -12,12 +12,16 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *  GNU General Public License for more details, see <https://www.gnu.org/licenses/>.
  */
+import RevenueTypeModel from '../../models/revenueTypeModel.js';
 
 async function validateSale(req, res, next) {
   // TODO replace upsertGraph
   const { crop_variety_sale, revenue_type_id } = req.body;
   // TODO: implement properly once LF-3595 is complete
-  const isCropRevenue = revenue_type_id === 1;
+  const cropSaleRevenueType = await RevenueTypeModel.query()
+    .where('revenue_name', 'Crop Sale')
+    .first();
+  const isCropRevenue = revenue_type_id === cropSaleRevenueType.revenue_type_id;
   if (isCropRevenue && !(crop_variety_sale && crop_variety_sale[0])) {
     return res.status(400).send('crop_variety_sale is required');
   }

packages/api/tests/sale.test.js

@@ -31,6 +31,7 @@ jest.mock('../src/middleware/acl/checkJwt.js', () =>
 import mocks from './mock.factories.js';
 import saleModel from '../src/models/saleModel.js';
 import cropVarietySaleModel from '../src/models/cropVarietySaleModel.js';
+import revenueTypeModel from '../src/models/revenueTypeModel.js';
 
 describe('Sale Tests', () => {
   let token;
@@ -374,11 +375,18 @@ describe('Sale Tests', () => {
     let cropVariety2;
     let someoneElsecrop;
     let someoneElseVariety;
+    let cropSaleRevenueType;
     beforeEach(async () => {
       [crop2] = await mocks.cropFactory({ promisedFarm: [farm] });
       [cropVariety2] = await mocks.crop_varietyFactory({ promisedCrop: [crop2] });
       [someoneElsecrop] = await mocks.cropFactory();
       [someoneElseVariety] = await mocks.crop_varietyFactory({ promisedCrop: [someoneElsecrop] });
+
+      cropSaleRevenueType = await revenueTypeModel
+        .query()
+        .where('revenue_name', 'Crop Sale')
+        .first();
+
       sampleReqBody = {
         ...mocks.fakeSale(),
         farm_id: farm.farm_id,
@@ -392,7 +400,7 @@ describe('Sale Tests', () => {
             crop_variety_id: cropVariety2.crop_variety_id,
           },
         ],
-        revenue_type_id: 1,
+        revenue_type_id: cropSaleRevenueType.revenue_type_id,
       };
     });