imageFilenames and imageFilename, backend integration tests, frontend tests, removed username references
This commit is contained in:
@@ -116,7 +116,7 @@ class ConditionCheckService {
|
||||
* @param {string} rentalId - Rental ID
|
||||
* @param {string} checkType - Type of check
|
||||
* @param {string} userId - User submitting the check
|
||||
* @param {Array} photos - Array of photo URLs
|
||||
* @param {Array} imageFilenames - Array of image filenames
|
||||
* @param {string} notes - Optional notes
|
||||
* @returns {Object} - Created condition check
|
||||
*/
|
||||
@@ -124,7 +124,7 @@ class ConditionCheckService {
|
||||
rentalId,
|
||||
checkType,
|
||||
userId,
|
||||
photos = [],
|
||||
imageFilenames = [],
|
||||
notes = null
|
||||
) {
|
||||
// Validate the check
|
||||
@@ -139,7 +139,7 @@ class ConditionCheckService {
|
||||
}
|
||||
|
||||
// Validate photos (basic validation)
|
||||
if (photos.length > 20) {
|
||||
if (imageFilenames.length > 20) {
|
||||
throw new Error("Maximum 20 photos allowed per condition check");
|
||||
}
|
||||
|
||||
@@ -147,7 +147,7 @@ class ConditionCheckService {
|
||||
rentalId,
|
||||
checkType,
|
||||
submittedBy: userId,
|
||||
photos,
|
||||
imageFilenames,
|
||||
notes,
|
||||
});
|
||||
|
||||
@@ -166,7 +166,7 @@ class ConditionCheckService {
|
||||
{
|
||||
model: User,
|
||||
as: "submittedByUser",
|
||||
attributes: ["id", "username", "firstName", "lastName"],
|
||||
attributes: ["id", "firstName", "lastName"],
|
||||
},
|
||||
],
|
||||
order: [["submittedAt", "ASC"]],
|
||||
@@ -192,7 +192,7 @@ class ConditionCheckService {
|
||||
{
|
||||
model: User,
|
||||
as: "submittedByUser",
|
||||
attributes: ["id", "username", "firstName", "lastName"],
|
||||
attributes: ["id", "firstName", "lastName"],
|
||||
},
|
||||
],
|
||||
});
|
||||
@@ -216,7 +216,7 @@ class ConditionCheckService {
|
||||
status: "completed",
|
||||
submittedAt: existingCheck.submittedAt,
|
||||
submittedBy: existingCheck.submittedBy,
|
||||
photoCount: existingCheck.photos.length,
|
||||
photoCount: existingCheck.imageFilenames.length,
|
||||
hasNotes: !!existingCheck.notes,
|
||||
};
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user