Fetch recommendations for filtered skills

Author: sidhant-khamankar

Backend/app.py

@@ -271,6 +271,7 @@ def protected():
 def get_recommendations():
     filter_skill_arr = request.json['filter_skills']
     filter_skill_arr = [x.strip().lower() for x in filter_skill_arr]
+    # print(filter_skill_arr)
     id = get_jwt_identity()
     student = Student.query.filter_by(Student_ID=id).first()
     skill_arr = []
@@ -279,10 +280,12 @@ def get_recommendations():
     else:
         skill_arr = filter_skill_arr
     rec_names = pipelining.predict(skill_arr)
+    # NOTE For testing
+    # rec_names = ["Dummy_a", "Dummy_ab"]
     # id, name, photo, headline, requirements, info created using branch-year-batch, skills
     cards = list()
     for rec_name in rec_names:
-        if(student.Name.title() == rec_name):
+        if(student.Name.lower() == rec_name):
             continue
         curr_rec = dict()
         rec = Student.query.filter_by(Name=rec_name).first()

Frontend/components/Discover.js

@@ -30,6 +30,7 @@ function Discover() {
 
   const [isLoading, setIsLoading] = React.useState(true);
   const [cards, setCards] = useState([]);
+  const [filtered_skills, setFiltered_skills] = useState([]);
 
   const styles = StyleSheet.create({
     container: {
@@ -150,7 +151,9 @@ function Discover() {
         // If user has done filtering post that list
         // If not, then post users skill list
         const res = await axiosInstance.post('/get_recommendations', {
-          filter_skills: [],
+          filter_skills: filtered_skills.map(skill => {
+            return skill.skill_name;
+          }),
         });
 
         setCards(res.data);
@@ -161,17 +164,18 @@ function Discover() {
 
     const init = async () => {
       try {
+        setIsLoading(true);
         updateAxiosInstance();
         //TODO Build two model files first using retraining function in server for updated db
-        // await getCards();
+        await getCards();
         setIsLoading(false);
       } catch (err) {
         console.log(err);
       }
     };
 
     init();
-  }, []);
+  }, [filtered_skills]);
 
   return (
     <View style={styles.container}>
@@ -212,7 +216,13 @@ function Discover() {
               color={colors.textWhite}
               onPress={() => setIsFilterModalVisible(true)}
             />
-            {isFilterModalVisible && <Filter close={setIsFilterModalVisible} />}
+            {isFilterModalVisible && (
+              <Filter
+                close={setIsFilterModalVisible}
+                setFiltered_skills={setFiltered_skills}
+                filtered_skills={filtered_skills}
+              />
+            )}
           </View>
 
           {/* Main content with swipe cards */}

Frontend/components/Filter.js

@@ -33,15 +33,15 @@ import SkillSection from './SkillSection';
 const {height} = Dimensions.get('window');
 
 function Filter(props) {
-  const {close} = props;
+  const {close, setFiltered_skills, filtered_skills} = props;
 
   const {colors} = useTheme();
 
   const springAnim = React.useRef(new Animated.Value(1000)).current;
 
   const [selectedLeftIndex, setSelectedLeftIndex] = React.useState(0);
 
-  const [filterSkills, setFilterSkills] = React.useState([]);
+  const [filterSkills, setFilterSkills] = React.useState(filtered_skills);
   const [filterLanguages, setFilterLanguages] = React.useState([]);
   const [filterYears, setFilterYears] = React.useState([]);
   const [filterBranches, setFilterBranches] = React.useState([]);
@@ -85,6 +85,7 @@ function Filter(props) {
       duration: 256,
       useNativeDriver: true,
     }).start(() => {
+      setFiltered_skills(filterSkills);
       close();
     });
   };

Frontend/components/SkillSection.js

@@ -1,8 +1,5 @@
 import React from 'react';
-import {
-  Chip,
-  Button,
-} from 'react-native-paper';
+import {Chip, Button} from 'react-native-paper';
 import {ScrollView, View} from 'react-native';
 import NewSection from './NewSection';
 import SearchBox from './SearchBox';
@@ -29,6 +26,7 @@ function SkillSection(props) {
         });
     });
     const flatSkills = skillArr.flat();
+    //can simply return flatSkills right?
     const ids = flatSkills.map(it => it.skill_id);
     return flatSkills.filter((it, index) => ids.indexOf(it.skill_id) === index);
   }