@agroyaar/sdk 2.0.3 → 2.0.5-0

package/dist/index.cjs

@@ -110,18 +110,18 @@ var mappers = {
     date: response.date
   }),
   getSpeedChangesChartPointsList: (response) => response.map(mappers.getSpeedChangesChart),
-  getMechanization: (dto) => ({
-    id: dto.id,
-    commonName: dto.commonName,
-    model: dto.model,
-    avatarURL: dto.avatarURL,
-    manufactureYear: dto.manufactureYear,
-    code: dto.code,
-    kind: dto.kind,
-    kindName: dto.kindName,
-    variety: mappers.getMechanizationVariety(dto.variety)
+  getMechanization: (res) => ({
+    id: res.id,
+    commonName: res.commonName,
+    model: res.model,
+    avatarURL: res.avatarURL,
+    manufactureYear: res.manufactureYear,
+    code: res.code,
+    kind: res.kind,
+    kindName: res.kindName,
+    variety: mappers.getMechanizationVariety(res.variety)
   }),
-  getMechanizationsList: (response) => response.map(mappers.getMechanization),
+  getMechanizations: (response) => response.map(mappers.getMechanization),
   getSeasonsProcess: (response) => ({
     id: response.id,
     label: response.label,
@@ -217,22 +217,22 @@ var createMechanizationServices = (client) => ({
       return wrapError(error);
     }
   },
-  getMechanizations: async (variables) => {
+  getMechanizations: async ({ farmerId, kindName }) => {
     try {
       const response = await client.typed(
         "get",
         "/farmers/{farmerId}/mechanizations",
         {
           params: {
-            kindName: variables.kindName
+            kindName
+          },
+          pathParams: {
+            farmerId
           }
         }
       );
-      return import_ts_belt2.R.Ok(
-        mappers.getMechanizationsList(
-          response.content["application/json"].result.data.mechanizations
-        )
-      );
+      const mechanizations = response.result.data.mechanizations;
+      return mechanizations ? import_ts_belt2.R.Ok(mappers.getMechanizations(mechanizations)) : import_ts_belt2.R.Error("missing questions in response");
     } catch (error) {
       return wrapError(error);
     }
@@ -252,11 +252,12 @@ var createMechanizationServices = (client) => ({
           }
         }
       );
-      return import_ts_belt2.R.Ok(
+      const motorizedMechanizationSensors = response.result.data.motorizedMechanizationSensors;
+      return motorizedMechanizationSensors ? import_ts_belt2.R.Ok(
         mappers.getMotorizedMechanizationSensors(
-          response.content["application/json"].result.data.motorizedMechanizationSensors
+          motorizedMechanizationSensors
         )
-      );
+      ) : import_ts_belt2.R.Error("missing questions in response");
     } catch (error) {
       return wrapError(error);
     }
@@ -319,18 +320,15 @@ var createMechanizationServices = (client) => ({
           }
         }
       );
-      const questions = data.result?.data?.mechanizationsQuestions;
-      if (!questions) {
-        throw new Error(
-          "Invalid API response: 'mechanizationsQuestions' missing"
-        );
-      }
-      return import_ts_belt2.R.Ok(mappers.getQuestions(questions));
+      const maybeQuestions = data?.result?.data.mechanizationsQuestions;
+      return maybeQuestions ? import_ts_belt2.R.Ok(mappers.getQuestions(maybeQuestions)) : import_ts_belt2.R.Error("missing questions in response");
     } catch (error) {
       return wrapError(error);
     }
   },
   getMechanizationMovementChanges: async ({
+    farmerId,
+    mechanizationId,
     fromDate,
     toDate
   }) => {
@@ -342,14 +340,15 @@ var createMechanizationServices = (client) => ({
           params: {
             fromDate,
             toDate
+          },
+          pathParams: {
+            farmerId,
+            mechanizationId
           }
         }
       );
-      return import_ts_belt2.R.Ok(
-        mappers.getMechanizationMovementChanges(
-          response.content["application/json"].result.data.movementChanges
-        )
-      );
+      const movementChanges = response.result.data.movementChanges;
+      return movementChanges ? import_ts_belt2.R.Ok(mappers.getMechanizationMovementChanges(movementChanges)) : import_ts_belt2.R.Error("missing questions in response");
     } catch (error) {
       return wrapError(error);
     }

package/dist/index.d.ts

@@ -62,7 +62,7 @@ type MechanizationModel = {
     model: string;
     commonName: string;
     avatarURL: string;
-    manufactureYear: number;
+    manufactureYear: string;
     code: string;
     kind: VarietyKind;
     kindName: MechanizationType;
@@ -141,6 +141,8 @@ type MechanizationMovementChangesModel = {
     date: string;
 };
 type MechanizationMovementChangesVariable = {
+    farmerId: string;
+    mechanizationId: string;
     fromDate?: string | null | undefined;
     toDate?: string | null | undefined;
 };
@@ -925,8 +927,7 @@ interface components {
             readonly model: string;
             /** @example shrek */
             readonly commonName: string;
-            /** @example 0 */
-            readonly manufactureYear: number;
+            readonly manufactureYear: string;
             /** @example code */
             readonly code: string;
             /** @example deviceCode */
@@ -1364,7 +1365,6 @@ interface operations {
         responses: {
             /** @description لیست اطلاعات با موفقیت دریافت شد */
             200: {
-                result: any;
                 headers: {
                     [name: string]: unknown;
                 };
@@ -2926,7 +2926,7 @@ type RequestParams<Op> = Op extends {
     };
 } ? Q extends object ? Q : never : never;
 type RequestBody<Op> = Op extends {
-    requestBody: {
+    requestBody?: {
         content: {
             "application/json": infer B;
         };
@@ -2939,7 +2939,11 @@ type PathParams<Op> = Op extends {
 } ? P extends object ? P : never : never;
 type ResponseData<Op> = Op extends {
     responses: {
-        200: infer R;
+        200: {
+            content: {
+                "application/json": infer R;
+            };
+        };
     };
 } ? R : unknown;
 
@@ -2961,13 +2965,13 @@ declare const createSDK: (config: ClientConfig, middlewares?: Parameters<typeof
         mechanization: {
             getMechanizationVarieties: ({ kindName, }: MechanizationVarietyVariables) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Ok<MechanizationVarietyModel[]>>;
             getSpeedChangesChartData: ({ farmerId, mechanizationId, }: SpeedChangesChartVariables) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Ok<SpeedChangesChartModel[]>>;
-            getMechanizations: (variables: MechanizationVariables) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Ok<MechanizationModel[]>>;
-            getMotorizedMechanizationSensors: ({ farmerId, mechanizationId, }: MotorizedMechanizationSensorsVariables) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Ok<MotorizedMechanizationSensorsModel>>;
+            getMechanizations: ({ farmerId, kindName }: MechanizationVariables) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Ok<MechanizationModel[]> | _mobily_ts_belt.Error<"missing questions in response">>;
+            getMotorizedMechanizationSensors: ({ farmerId, mechanizationId, }: MotorizedMechanizationSensorsVariables) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Error<"missing questions in response"> | _mobily_ts_belt.Ok<MotorizedMechanizationSensorsModel>>;
             SubmitTrackingDeviceCode: ({ farmerId, mechanizationId, deviceCode, }: SubmitTrackingDeviceVariables) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Ok<TrackingDeviceCodeModel>>;
             getSeasonsProcess: () => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Ok<SeasonsProcessModel[]>>;
             UpdateTrackingDeviceCode: ({ farmerId, mechanizationId, deviceCode, verificationToken, }: UpdateTrackingDeviceVariables) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Ok<TrackingDeviceCodeModel>>;
-            getMechanizationQuestionList: ({ varietyId, }: GetMechanizationQuestionVariable) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Ok<MechanizationQuestionModel[]>>;
-            getMechanizationMovementChanges: ({ fromDate, toDate, }: MechanizationMovementChangesVariable) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Ok<MechanizationMovementChangesModel[]>>;
+            getMechanizationQuestionList: ({ varietyId, }: GetMechanizationQuestionVariable) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Error<"missing questions in response"> | _mobily_ts_belt.Ok<MechanizationQuestionModel[]>>;
+            getMechanizationMovementChanges: ({ farmerId, mechanizationId, fromDate, toDate, }: MechanizationMovementChangesVariable) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Error<"missing questions in response"> | _mobily_ts_belt.Ok<MechanizationMovementChangesModel[]>>;
             DeleteTrackingDeviceCode: ({ farmerId, mechanizationId, verificationToken, }: DeleteTrackingDeviceVariables) => Promise<_mobily_ts_belt.Error<Error> | _mobily_ts_belt.Ok<TrackingDeviceCodeModel>>;
         };
     };

package/dist/index.mjs

@@ -74,18 +74,18 @@ var mappers = {
     date: response.date
   }),
   getSpeedChangesChartPointsList: (response) => response.map(mappers.getSpeedChangesChart),
-  getMechanization: (dto) => ({
-    id: dto.id,
-    commonName: dto.commonName,
-    model: dto.model,
-    avatarURL: dto.avatarURL,
-    manufactureYear: dto.manufactureYear,
-    code: dto.code,
-    kind: dto.kind,
-    kindName: dto.kindName,
-    variety: mappers.getMechanizationVariety(dto.variety)
+  getMechanization: (res) => ({
+    id: res.id,
+    commonName: res.commonName,
+    model: res.model,
+    avatarURL: res.avatarURL,
+    manufactureYear: res.manufactureYear,
+    code: res.code,
+    kind: res.kind,
+    kindName: res.kindName,
+    variety: mappers.getMechanizationVariety(res.variety)
   }),
-  getMechanizationsList: (response) => response.map(mappers.getMechanization),
+  getMechanizations: (response) => response.map(mappers.getMechanization),
   getSeasonsProcess: (response) => ({
     id: response.id,
     label: response.label,
@@ -181,22 +181,22 @@ var createMechanizationServices = (client) => ({
       return wrapError(error);
     }
   },
-  getMechanizations: async (variables) => {
+  getMechanizations: async ({ farmerId, kindName }) => {
     try {
       const response = await client.typed(
         "get",
         "/farmers/{farmerId}/mechanizations",
         {
           params: {
-            kindName: variables.kindName
+            kindName
+          },
+          pathParams: {
+            farmerId
           }
         }
       );
-      return R2.Ok(
-        mappers.getMechanizationsList(
-          response.content["application/json"].result.data.mechanizations
-        )
-      );
+      const mechanizations = response.result.data.mechanizations;
+      return mechanizations ? R2.Ok(mappers.getMechanizations(mechanizations)) : R2.Error("missing questions in response");
     } catch (error) {
       return wrapError(error);
     }
@@ -216,11 +216,12 @@ var createMechanizationServices = (client) => ({
           }
         }
       );
-      return R2.Ok(
+      const motorizedMechanizationSensors = response.result.data.motorizedMechanizationSensors;
+      return motorizedMechanizationSensors ? R2.Ok(
         mappers.getMotorizedMechanizationSensors(
-          response.content["application/json"].result.data.motorizedMechanizationSensors
+          motorizedMechanizationSensors
         )
-      );
+      ) : R2.Error("missing questions in response");
     } catch (error) {
       return wrapError(error);
     }
@@ -283,18 +284,15 @@ var createMechanizationServices = (client) => ({
           }
         }
       );
-      const questions = data.result?.data?.mechanizationsQuestions;
-      if (!questions) {
-        throw new Error(
-          "Invalid API response: 'mechanizationsQuestions' missing"
-        );
-      }
-      return R2.Ok(mappers.getQuestions(questions));
+      const maybeQuestions = data?.result?.data.mechanizationsQuestions;
+      return maybeQuestions ? R2.Ok(mappers.getQuestions(maybeQuestions)) : R2.Error("missing questions in response");
     } catch (error) {
       return wrapError(error);
     }
   },
   getMechanizationMovementChanges: async ({
+    farmerId,
+    mechanizationId,
     fromDate,
     toDate
   }) => {
@@ -306,14 +304,15 @@ var createMechanizationServices = (client) => ({
           params: {
             fromDate,
             toDate
+          },
+          pathParams: {
+            farmerId,
+            mechanizationId
           }
         }
       );
-      return R2.Ok(
-        mappers.getMechanizationMovementChanges(
-          response.content["application/json"].result.data.movementChanges
-        )
-      );
+      const movementChanges = response.result.data.movementChanges;
+      return movementChanges ? R2.Ok(mappers.getMechanizationMovementChanges(movementChanges)) : R2.Error("missing questions in response");
     } catch (error) {
       return wrapError(error);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agroyaar/sdk",
-  "version": "2.0.3",
+  "version": "2.0.5-0",
   "description": "",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",