Merge pull request #155 from topcoder-platform/dev

Gigs Optimization Update Release

Author: sushilshinde

package-lock.json

@@ -81,6 +81,7 @@
     "react-date-range": "^1.1.3",
     "react-dom": "^16.12.0",
     "react-dropzone": "^11.3.2",
+    "react-loading": "^2.0.3",
     "react-redux": "^7.2.3",
     "react-responsive-modal": "^6.1.0",
     "react-select": "^1.3.0",

package.json

@@ -112,8 +112,8 @@ const App = () => {
           </div>
           <div className="sidebar-footer">
             <a
-              className="button button-primary"
-              href="https://github.com/topcoder-platform/micro-frontends-earn-app/issues/new?assignees=&labels=&template=bug_report.md&title="
+              className="button"
+              href="https://discussions.topcoder.com/discussion/8870/new-beta-site-discuss?new=1"
               target="_blank"
             >
               GIVE APPLICATION FEEDBACK

src/App.jsx

@@ -1,5 +1,9 @@
 import { createActions } from "redux-actions";
-import { PER_PAGE } from "../constants";
+import {
+  PER_PAGE,
+  CHECKING_GIG_TIMES,
+  DELAY_CHECK_GIG_TIME,
+} from "../constants";
 import service from "../services/myGigs";
 
 /**
@@ -30,9 +34,29 @@ async function updateProfile(profile) {
   return service.updateProfile(profile);
 }
 
+async function startCheckingGigs(externalId) {
+  let i = 0;
+  while (i < CHECKING_GIG_TIMES) {
+    const res = await service.startCheckingGigs(externalId);
+    if (res && !res.synced) {
+      await new Promise((resolve) => {
+        setTimeout(() => {
+          resolve();
+        }, DELAY_CHECK_GIG_TIME);
+      });
+      i++;
+      continue;
+    } else {
+      return {};
+    }
+  }
+  return {};
+}
+
 export default createActions({
   GET_MY_GIGS: getMyGigs,
   LOAD_MORE_MY_GIGS: loadMoreMyGigs,
   GET_PROFILE: getProfile,
   UPDATE_PROFILE: updateProfile,
+  START_CHECKING_GIGS: startCheckingGigs,
 });

src/actions/myGigs.js

@@ -5,6 +5,7 @@
 const Scopes = {
   // JobApplication
   READ_JOBAPPLICATION: "read:earn-jobApplications",
+  READ_JOB: "read:earn-job",
   READ_PROFILE: "read:earn-profile",
   WRITE_PROFILE: "write:earn-profile",
   ALL_PROFILE: "all:earn-profile",

src/api/app-constants.js

@@ -15,6 +15,12 @@ async function getMyJobApplications(req, res) {
   res.send(result.result);
 }
 
+async function getJob(req, res) {
+  const result = await service.getJob(req.authUser, req.query);
+  res.send(result);
+}
+
 module.exports = {
   getMyJobApplications,
+  getJob,
 };

src/api/controllers/JobApplicationController.js

@@ -88,6 +88,60 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Error"
+  /job:
+    get:
+      tags:
+        - Job
+      description: |
+        Check whether the Job Application info has been synced.
+        
+        **Authorization** All topcoder members are allowed.
+      security:
+        - bearerAuth: []
+      parameters:
+        - in: query
+          name: externalId
+          required: true
+          schema:
+            type: string
+          description: The Job External Id
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JobSynced"
+        "400":
+          description: Bad request
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "401":
+          description: Not authenticated
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "403":
+          description: Forbidden
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "404":
+          description: Not Found
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "500":
+          description: Internal Server Error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
   /profile:
     get:
       tags:
@@ -187,6 +241,14 @@ components:
       scheme: bearer
       bearerFormat: JWT
   schemas:
+    JobSynced:
+      required:
+        - synced
+      properties:
+        synced:
+          type: boolean
+          description: "Whether the job application has been synced"
+          example: true
     JobApplication:
       required:
         - title

src/api/docs/swagger.yaml

@@ -12,4 +12,12 @@ module.exports = {
       scopes: [constants.Scopes.READ_JOBAPPLICATION],
     },
   },
+  "/job": {
+    get: {
+      controller: "JobApplicationController",
+      method: "getJob",
+      auth: "jwt",
+      scopes: [constants.Scopes.READ_JOB],
+    },
+  },
 };

src/api/routes/JobApplicationRoutes.js

@@ -61,7 +61,8 @@ async function getMyJobApplications(currentUser, criteria) {
         min: job.minSalary,
         max: job.maxSalary,
         frequency: job.rateType,
-        currency: job.currency,
+        // currency: job.currency,
+        currency: "$",
       },
       hoursPerWeek: job.hoursPerWeek,
       location: job.jobLocation,
@@ -96,6 +97,51 @@ getMyJobApplications.schema = Joi.object()
   })
   .required();
 
+async function getJob(currentUser, criteria) {
+  const emptyResult = {
+    synced: false,
+  };
+  // we expect logged-in users
+  if (currentUser.isMachine) {
+    return emptyResult;
+  }
+  // get user id by calling taas-api with current user's token
+  const { id: userId } = await helper.getCurrentUserDetails(
+    currentUser.jwtToken
+  );
+  if (!userId) {
+    throw new errors.NotFoundError(
+      `Id for user: ${currentUser.userId} not found`
+    );
+  }
+  // get job based on the jobExternalId
+  const { result: jobs } = await helper.getJobs(criteria);
+  if (jobs && jobs.length) {
+    const candidates = jobs[0].candidates || [];
+    const newJob = candidates.find((item) => item.userId == userId);
+    if (newJob) {
+      return {
+        synced: true,
+      };
+    }
+  }
+  return {
+    synced: false,
+  };
+}
+
+getJob.schema = Joi.object()
+  .keys({
+    currentUser: Joi.object().required(),
+    criteria: Joi.object()
+      .keys({
+        externalId: Joi.string(),
+      })
+      .required(),
+  })
+  .required();
+
 module.exports = {
   getMyJobApplications,
+  getJob,
 };

src/api/services/JobApplicationService.js

@@ -37,17 +37,7 @@ const Banner = () => {
             please let us know! This is what the Beta phase is intended for, and
             your feedback will enable us to greatly improve the new site.{" "}
           </p>
-          <p>
-            You can click on the Feedback button on page or file a github ticket
-            at{" "}
-            <a
-              href="https://github.com/topcoder-platform/micro-frontends-earn-app/issues/new?assignees=&labels=&template=bug_report.md"
-              target="_blank"
-            >
-              https://github.com/topcoder-platform/micro-frontends-earn-app/issues/new?template=bug_report.md
-            </a>
-            .
-          </p>
+          <p>You can click on the Feedback button on page.</p>
           <p>Thank you!</p>
         </div>
       )}